author | Junio C Hamano <gitster@pobox.com> | |
Mon, 21 Jun 2010 12:40:48 +0000 (05:40 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 21 Jun 2010 12:40:48 +0000 (05:40 -0700) |
* bs/userdiff-php:
diff: Support visibility modifiers in the PHP hunk header regexp
diff: Support visibility modifiers in the PHP hunk header regexp
userdiff.c | patch | blob | history |
diff --git a/userdiff.c b/userdiff.c
index df992490d5f86b5eff2b87e90090b1ec576aae9a..38563daa3c7582ca87565886d74f16d11b292a57 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
"|[-+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]+"