From: Alexey Shumkin <zapped@mail.ru>
Date: Tue, 11 Jan 2011 08:53:59 +0000 (+0300)
Subject: userdiff: match Pascal class methods
X-Git-Tag: v1.7.4-rc3~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad5b6942d5b9127cc940d2135ce82c633013418a;p=git.git

userdiff: match Pascal class methods

Class declarations were already covered by the second pattern, but class
methods have the 'class' keyword in front too. Account for it.

Signed-off-by: Alexey Shumkin <zapped@mail.ru>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/userdiff.c b/userdiff.c
index 2d5453697..234697821 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).*)$",