Code

Merge branch 'as/userdiff-pascal'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2011 18:54:12 +0000 (10:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2011 18:54:12 +0000 (10:54 -0800)
* as/userdiff-pascal:
  userdiff: match Pascal class methods

userdiff.c

index c384b39e4daf1226a2c13c74dc2a4a2f75b8e63b..9ebf231ea5ee2e7fd1f71c9557a6537d29428d8d 100644 (file)
@@ -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).*)$",