From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Jun 2010 18:22:05 +0000 (-0700)
Subject: Merge branch 'bs/userdiff-php'
X-Git-Tag: v1.7.2-rc0~73
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9559910cac77526a95dd5dca93a2e3e6d290c5b9?ds=inline;hp=-c

Merge branch 'bs/userdiff-php'

* bs/userdiff-php:
diff: Support visibility modifiers in the PHP hunk header regexp
---

9559910cac77526a95dd5dca93a2e3e6d290c5b9
diff --combined userdiff.c
index 67003fbb23,38563daa3c..c49cc1b67e
--- a/userdiff.c
+++ b/userdiff.c
@@@ -1,4 -1,3 +1,4 @@@
 +#include "cache.h"
  #include "userdiff.h"
  #include "cache.h"
  #include "attr.h"
@@@ -45,7 -44,9 +45,9 @@@ PATTERNS("pascal"
  	 "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
  	 "|<>|<=|>=|:=|\\.\\."
  	 "|[^[:space:]]|[\x80-\xff]+"),
- PATTERNS("php", "^[\t ]*((function|class).*)",
+ PATTERNS("php",
+ 	 "^[\t ]*(((public|protected|private|static)[\t ]+)*function.*)$\n"
+ 	 "^[\t ]*(class.*)$",
  	 /* -- */
  	 "[a-zA-Z_][a-zA-Z0-9_]*"
  	 "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
@@@ -168,12 -169,6 +170,12 @@@ static int parse_tristate(int *b, cons
  	return 1;
  }
  
 +static int parse_bool(int *b, const char *k, const char *v)
 +{
 +	*b = git_config_bool(k, v);
 +	return 1;
 +}
 +
  int userdiff_config(const char *k, const char *v)
  {
  	struct userdiff_driver *drv;
@@@ -188,8 -183,6 +190,8 @@@
  		return parse_string(&drv->external, k, v);
  	if ((drv = parse_driver(k, v, "textconv")))
  		return parse_string(&drv->textconv, k, v);
 +	if ((drv = parse_driver(k, v, "cachetextconv")))
 +		return parse_bool(&drv->textconv_want_cache, k, v);
  	if ((drv = parse_driver(k, v, "wordregex")))
  		return parse_string(&drv->word_regex, k, v);