userdiff: support C++ ->* and .* operators in the word regexp
authorJohannes Sixt <j6t@kdbg.org>
Fri, 21 Mar 2014 21:07:13 +0000 (22:07 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Mar 2014 21:47:50 +0000 (14:47 -0700)
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>
userdiff.c
index 10b61ec37da035fb864c94a4037960ed30b1248c..434535bd63485bc83619b4580dc86a2cd407e26d 100644 (file)
@@ -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"