Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix

* bc/maint-diff-hunk-header-fix:
diff hunk pattern: fix misconverted "\{" tex macro introducers

Conflicts:
diff.c

diff --git a/diff.c b/diff.c
index 1bcbbd5bb1e67dc238fe4f773024d49c1f8d2af7..0f98bff46b222bcf36347fccbaf18a056dd64135 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1421,8 +1421,10 @@ static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
        { "python", "^[ \t]*((class|def)[ \t].*)$", REG_EXTENDED },
        { "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
          REG_EXTENDED },
+       { "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
+         REG_EXTENDED },
        { "tex",
-         "^(\\\\((sub)*section|chapter|part)\\*{0,1}\{.*)$",
+         "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
          REG_EXTENDED },
 };