Andrew's git / gitweb.git / diff
?
Merge branch 'bs/userdiff-php'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:22:05 +0000 (11:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:22:05 +0000 (11:22 -0700)
* bs/userdiff-php:
diff: Support visibility modifiers in the PHP hunk header regexp

userdiff.c patch | blob | history
diff --git a/userdiff.c b/userdiff.c
index 67003fbb232cd85627f61c02a616b3d6a9ccd5d2..c49cc1b67e1164c561fb20839272bd8b1f7dde6d 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -45,7 +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]+"