summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2014-03-21 21:07:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-21 21:47:50 (GMT)
commit407e07f2a6f55e605fda9e90cb622887269f68b5 (patch)
treeb8e644f0dd737346e2af41875a595c73ac068672 /userdiff.c
parent5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff)
downloadgit-407e07f2a6f55e605fda9e90cb622887269f68b5.zip
git-407e07f2a6f55e605fda9e90cb622887269f68b5.tar.gz
git-407e07f2a6f55e605fda9e90cb622887269f68b5.tar.bz2
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>
Diffstat (limited to 'userdiff.c')
-rw-r--r--userdiff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c
index 10b61ec..434535b 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"