diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2014-03-21 22:07:14 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-03-21 14:48:07 -0700 |
| commit | abf8f9860248d8c213600974742f18dadaa8fbb5 (patch) | |
| tree | 8a1138dc96032616f84dc6152355132f4f201829 | |
| parent | userdiff: support C++ ->* and .* operators in the word regexp (diff) | |
| download | tgif-abf8f9860248d8c213600974742f18dadaa8fbb5.tar.xz | |
userdiff: support unsigned and long long suffixes of integer constants
Do not split constants such as 123U, 456ll, 789UL at the first U or
second L.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index 434535bd63..8830417e3b 100644 --- a/userdiff.c +++ b/userdiff.c @@ -132,7 +132,7 @@ PATTERNS("cpp", "^((struct|class|enum)[^;]*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" + "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*" "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"), PATTERNS("csharp", /* Keywords */ |