diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2014-03-21 22:07:13 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-03-21 14:47:50 -0700 |
| commit | 407e07f2a6f55e605fda9e90cb622887269f68b5 (patch) | |
| tree | b8e644f0dd737346e2af41875a595c73ac068672 | |
| parent | Git 1.9.0 (diff) | |
| download | tgif-407e07f2a6f55e605fda9e90cb622887269f68b5.tar.xz | |
userdiff: support C++ ->* and .* operators in the word regexp
The character sequences ->* and .* are valid C++ operators. Keep them
together in --word-diff mode.
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 10b61ec37d..434535bd63 100644 --- a/userdiff.c +++ b/userdiff.c @@ -133,7 +133,7 @@ PATTERNS("cpp", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" - "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), + "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"), PATTERNS("csharp", /* Keywords */ "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n" |