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>
Johannes Sixt committed
Mar 21, 2014 at 22:07 UTC
407e07f2a6f55e605fda9e90cb622887269f68b5
1 file changed
+1
-1
userdiff.c
+1
-1
@@ -133,7 +133,7 @@ PATTERNS("cpp",
133
/* -- */
134
"[a-zA-Z_][a-zA-Z0-9_]*"
135
"|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
136
- "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
136
+ "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
137
PATTERNS("csharp",
138
/* Keywords */
139
"!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n"