summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-24 10:54:12 -0800
committerJunio C Hamano <gitster@pobox.com>2011-01-24 10:54:12 -0800
commit342953a6860915b4b66dfb24147c46a191342daf (patch)
treeb395d88b99a5b88ea8d5c7863aaf16a22a50f5df
parent0efbb7d9f488112d20a8ff257b72a3699aae8ef8 (diff)
parentad5b6942d5b9127cc940d2135ce82c633013418a (diff)
downloadgit-342953a6860915b4b66dfb24147c46a191342daf.tar.gz
Merge branch 'as/userdiff-pascal'
* as/userdiff-pascal: userdiff: match Pascal class methods
-rw-r--r--userdiff.c2
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).*)$",