[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f485975: Don't match C++ template delims starting w
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] master f485975: Don't match C++ template delims starting within a token. FIxes bug #28418. |
Date: |
Tue, 12 Sep 2017 12:29:09 -0400 (EDT) |
branch: master
commit f4859757b63a056392af410fce6b4938f7f27c00
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>
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 5ac4a76..9ea0b20 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master f485975: Don't match C++ template delims starting within a token. FIxes bug #28418.,
Alan Mackenzie <=