From: Johannes Sixt Date: Fri, 21 Mar 2014 21:07:13 GMT Subject: [PATCH 01/10] userdiff: support C++ ->* and .* operators in the word regexp Message-ID: <293a6d890efa25bb6c2887afe75b11a47edd8810.1395433874.git.j6t@kdbg.org> In-Reply-To: The character sequences ->* and .* are valid C++ operators. Keep them together in --word-diff mode. Signed-off-by: Johannes Sixt --- userdiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdiff.c b/userdiff.c index 10b61ec..434535b 100644 --- a/userdiff.c +++ b/userdiff.c @@ -133,7 +133,7 @@ /* -- */ "[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" -- 1.8.5.2.244.g9fb3fb1