diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-04-08 17:04:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-08 12:19:09 -0700 |
| commit | 82512e008c82834df5a00ea79e1091da45b330b0 (patch) | |
| tree | 125a0f0117ed17b4bd72f1625f6979e064be8c81 /userdiff.c | |
| parent | 6d1c9c527e5d2f4a00827ee2eac29709a1aff1ee (diff) | |
userdiff style: normalize pascal regex declaration
Declare the pascal pattern consistently with how we declare the others, not having "\n" on one line by itself, but as part of the pattern, and when there are alterations have the "|" at the start, not end of the line. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/userdiff.c b/userdiff.c index 33b0ce4020..978ae64155 100644 --- a/userdiff.c +++ b/userdiff.c @@ -175,9 +175,8 @@ PATTERNS("objc", "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), PATTERNS("pascal", - "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|" - "implementation|initialization|finalization)[ \t]*.*)$" - "\n" + "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface" + "|implementation|initialization|finalization)[ \t]*.*)$\n" "^(.*=[ \t]*(class|record).*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" |