From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Apr 2023 21:33:35 +0000 (-0700)
Subject: Merge branch 'rs/userdiff-multibyte-regex'
X-Git-Tag: v2.41.0-rc0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbfe844aa1b6b0b9513f2ae2fc3d18ff3dd385e6;p=thirdparty%2Fgit.git

Merge branch 'rs/userdiff-multibyte-regex'

The userdiff regexp patterns for various filetypes that are built
into the system have been updated to avoid triggering regexp errors
from UTF-8 aware regex engines.

* rs/userdiff-multibyte-regex:
  userdiff: support regexec(3) with multi-byte support
---

cbfe844aa1b6b0b9513f2ae2fc3d18ff3dd385e6
diff --cc userdiff.c
index 09203fbc35,8bb7b7a4ba..eaec6ebb5e
--- a/userdiff.c
+++ b/userdiff.c
@@@ -294,8 -294,8 +296,8 @@@ PATTERNS("scheme"
  	 /* All other words should be delimited by spaces or parentheses */
  	 "|([^][)(}{[ \t])+"),
  PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
- 	 "\\\\[a-zA-Z@]+|\\\\.|[a-zA-Z0-9\x80-\xff]+"),
+ 	 "\\\\[a-zA-Z@]+|\\\\.|([a-zA-Z0-9]|[^\x01-\x7f])+"),
 -{ "default", NULL, -1, { NULL, 0 } },
 +{ "default", NULL, NULL, -1, { NULL, 0 } },
  };
  #undef PATTERNS
  #undef IPATTERN