From f4859757b63a056392af410fce6b4938f7f27c00 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Tue, 12 Sep 2017 16:19:52 +0000 Subject: Don't match C++ template delims starting within a token. FIxes bug #28418. * lisp/progmodes/cc-engine.el (c-restore-<>-properties): After failing an attempted match from the start of a token (in particular, "<<"), move to the next token rather than the nex character before searching for the next "<". --- lisp/progmodes/cc-engine.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 5ac4a769337..9ea0b2046a6 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -6418,7 +6418,7 @@ comment at the start of cc-engine.el for more info." (not (eq (c-get-char-property (point) 'c-type) 'c-decl-arg-start))))))) (or (c-forward-<>-arglist nil) - (forward-char))))) + (c-forward-token-2))))) ;; Functions to handle C++ raw strings. -- cgit v1.2.1