commit 9559910cac77526a95dd5dca93a2e3e6d290c5b9
author Junio C Hamano <gitster@pobox.com> Sun Jun 13 11:22:05 2010 -0700
committer Junio C Hamano <gitster@pobox.com> Sun Jun 13 11:22:05 2010 -0700
tree cc54ed8304998eecc379db3764e0cb6de1931eff
parent e391fdfc69bd64e11f31416c38ab491a04c0ffa0
parent 6d2f208c3dd39493f4d45ea67c55a1b7fe06626a

Merge branch 'bs/userdiff-php'

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

userdiff.c

diff --git a/userdiff.c b/userdiff.c
index 67003fb..c49cc1b 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -45,7 +45,9 @@
 	 "|[-+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]+"