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 --cc diff.c
index 1bcbbd5bb1e67dc238fe4f773024d49c1f8d2af7,a28373861689d1baf02ffdf969da1e843ea9c237..0f98bff46b222bcf36347fccbaf18a056dd64135
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -1414,16 -1406,16 +1414,18 @@@ static const struct funcname_pattern_en
        { "pascal",
          "^((procedure|function|constructor|destructor|interface|"
                "implementation|initialization|finalization)[ \t]*.*)$"
 -        "|"
 +        "\n"
          "^(.*=[ \t]*(class|record).*)$",
          REG_EXTENDED },
 +      { "php", "^[\t ]*((function|class).*)", REG_EXTENDED },
 +      { "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 },
 -      { "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
 -        REG_EXTENDED },
  };
  
  static const struct funcname_pattern_entry *diff_funcname_pattern(struct diff_filespec *one)