From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 12:40:48 +0000 (-0700)
Subject: Merge branch 'bs/userdiff-php' into maint
X-Git-Tag: v1.7.2-rc0~38^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/065a652d6452c84efc8d1fbe8636ab8aeae5348e?hp=951f92d2abb28f59e8207cce13aac3b15c95eeca

Merge branch 'bs/userdiff-php' into maint

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

diff --git a/userdiff.c b/userdiff.c
index df992490d5..38563daa3c 100644
--- 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]+"