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

gitster · gitster · commit 92bb978541af · 2008-09-20T18:37:47.000-07:00
* 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
@@ -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 },
 };
 
