From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Sep 2008 06:51:01 +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~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cd0843198fecf9faa6e82f6db15fc9c7ec31d3f4;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: use extended regexp to find hunk headers

Conflicts:
	diff.c
---

cd0843198fecf9faa6e82f6db15fc9c7ec31d3f4
diff --cc diff.c
index 7b24672d3,175a044a3..5b9b07485
--- a/diff.c
+++ b/diff.c
@@@ -1404,23 -1399,23 +1404,26 @@@ static const struct funcname_pattern_en
  }
  
  static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
- 	{ "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$", 0 },
++	{ "bibtex", "(@[a-zA-Z]{1,}[ \t]*\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
++	  REG_EXTENDED },
 +	{ "html", "^\\s*\\(<[Hh][1-6]\\s.*>.*\\)$", 0 },
- 	{ "java", "!^[ 	]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
- 			"new\\|return\\|switch\\|throw\\|while\\)\n"
- 			"^[ 	]*\\(\\([ 	]*"
- 			"[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
- 			"[ 	]*([^;]*\\)$", 0 },
- 	{ "pascal", "^\\(\\(procedure\\|function\\|constructor\\|"
- 			"destructor\\|interface\\|implementation\\|"
- 			"initialization\\|finalization\\)[ \t]*.*\\)$"
- 			"\\|"
- 			"^\\(.*=[ \t]*\\(class\\|record\\).*\\)$",
- 			0 },
+ 	{ "java",
+ 	  "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
+ 	  "^[ \t]*(([ \t]*[A-Za-z_][A-Za-z_0-9]*){2,}[ \t]*\\([^;]*)$",
+ 	  REG_EXTENDED },
+ 	{ "pascal",
+ 	  "^((procedure|function|constructor|destructor|interface|"
+ 		"implementation|initialization|finalization)[ \t]*.*)$"
+ 	  "|"
+ 	  "^(.*=[ \t]*(class|record).*)$",
+ 	  REG_EXTENDED },
 -	{ "bibtex", "(@[a-zA-Z]{1,}[ \t]*\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
 +	{ "php", "^[\t ]*\\(\\(function\\|class\\).*\\)", 0 },
 +	{ "python", "^\\s*\\(\\(class\\|def\\)\\s.*\\)$", 0 },
- 	{ "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$", 0 },
- 	{ "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$", 0 },
++	{ "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
+ 	  REG_EXTENDED },
+ 	{ "tex",
+ 	  "^(\\\\((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)