[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 223429c: Handle template delimiters in C++ member i
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] master 223429c: Handle template delimiters in C++ member init constructs. |
Date: |
Sat, 27 Aug 2016 15:48:13 +0000 (UTC) |
branch: master
commit 223429c09bb457f686693a6280339a4888bbad1c
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>
Handle template delimiters in C++ member init constructs.
* lisp/progmodes/cc-engine.el (c-back-over-list-of-member-inits): Add
handling for "<....>"s.
---
lisp/progmodes/cc-engine.el | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 940d7a4..ecee57e 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -7410,7 +7410,8 @@ comment at the start of cc-engine.el for more info."
(defmacro c-back-over-list-of-member-inits ()
;; Go back over a list of elements, each looking like:
;; <symbol> (<expression>) ,
- ;; or <symbol> {<expression>} ,
+ ;; or <symbol> {<expression>} , (with possibly a <....> expressions
+ ;; following the <symbol>).
;; when we are putatively immediately after a comma. Stop when we don't see
;; a comma. If either of <symbol> or bracketed <expression> is missing,
;; throw nil to 'level. If the terminating } or ) is unmatched, throw nil
@@ -7423,6 +7424,11 @@ comment at the start of cc-engine.el for more info."
(when (not (c-go-list-backward))
(throw 'done nil))
(c-backward-syntactic-ws)
+ (while (eq (char-before) ?>)
+ (when (not (c-backward-<>-arglist nil))
+ (throw 'done nil))
+ (c-backward-syntactic-ws))
+ (c-backward-syntactic-ws)
(when (not (c-back-over-compound-identifier))
(throw 'level nil))
(c-backward-syntactic-ws)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 223429c: Handle template delimiters in C++ member init constructs.,
Alan Mackenzie <=