diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:40:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:40:48 -0700 |
| commit | 065a652d6452c84efc8d1fbe8636ab8aeae5348e (patch) | |
| tree | fa5509d373b4529a7e6fb7768cd3636482bbb5ca | |
| parent | 951f92d2abb28f59e8207cce13aac3b15c95eeca (diff) | |
| parent | 6d2f208c3dd39493f4d45ea67c55a1b7fe06626a (diff) | |
| download | git-065a652d6452c84efc8d1fbe8636ab8aeae5348e.tar.gz git-065a652d6452c84efc8d1fbe8636ab8aeae5348e.tar.xz | |
Merge branch 'bs/userdiff-php' into maint
* bs/userdiff-php:
diff: Support visibility modifiers in the PHP hunk header regexp
| -rw-r--r-- | userdiff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index df992490d..38563daa3 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]+" |