Merge branch 'bs/userdiff-php' into maint

* bs/userdiff-php: diff: Support visibility modifiers in the PHP hunk header regexp
git-mirror · Jun 21, 2010 · 065a652 · 065a652
2 parents 951f92d + 6d2f208
commit 065a652
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/userdiff.c b/userdiff.c
@@ -44,7 +44,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]+"