From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Sep 2008 01:36:22 +0000 (-0700)
Subject: Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
X-Git-Tag: v1.6.1-rc1~194^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/92bb9785?hp=3d8dccd74aa29a9019c4e8b52e75a40189e6f5cb

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 1bcbbd5bb1..0f98bff46b 100644
--- 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 },
 };