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: http://git.tremily.us/?a=commitdiff_plain;h=92bb978541af02ac624d1b9aeec296691cc15734;p=git.git

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
---

92bb978541af02ac624d1b9aeec296691cc15734
diff --cc diff.c
index 1bcbbd5bb,a28373861..0f98bff46
--- a/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)