diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-01-24 10:54:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-24 10:54:12 -0800 |
| commit | 342953a6860915b4b66dfb24147c46a191342daf (patch) | |
| tree | b395d88b99a5b88ea8d5c7863aaf16a22a50f5df | |
| parent | Merge branch 'jn/setup-fixes' (diff) | |
| parent | userdiff: match Pascal class methods (diff) | |
| download | tgif-342953a6860915b4b66dfb24147c46a191342daf.tar.xz | |
Merge branch 'as/userdiff-pascal'
* as/userdiff-pascal:
userdiff: match Pascal class methods
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index c384b39e4d..9ebf231ea5 100644 --- a/userdiff.c +++ b/userdiff.c @@ -52,7 +52,7 @@ PATTERNS("objc", "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->" "|[^[:space:]]|[\x80-\xff]+"), PATTERNS("pascal", - "^((procedure|function|constructor|destructor|interface|" + "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|" "implementation|initialization|finalization)[ \t]*.*)$" "\n" "^(.*=[ \t]*(class|record).*)$", |