Mercurial > emacs
changeset 111882:2f32e957c8ff
(c-forward-type): Before scanning a template arglist, check that the
current language supports this.
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Sun, 12 Dec 2010 12:24:56 +0000 |
| parents | 66cacb91ed45 |
| children | e6c418577289 |
| files | lisp/ChangeLog lisp/progmodes/cc-engine.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Dec 11 17:44:32 2010 +0100 +++ b/lisp/ChangeLog Sun Dec 12 12:24:56 2010 +0000 @@ -1,3 +1,8 @@ +2010-12-12 Alan Mackenzie <acm@muc.de> + + * progmodes/cc-engine.el (c-forward-type): Before scanning a + template arglist, check that the current language supports this. + 2010-12-11 Glenn Morris <rgm@gnu.org> * vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable
--- a/lisp/progmodes/cc-engine.el Sat Dec 11 17:44:32 2010 +0100 +++ b/lisp/progmodes/cc-engine.el Sun Dec 12 12:24:56 2010 +0000 @@ -5846,7 +5846,8 @@ ;; `c-record-type-identifiers' is non-nil. ;; ;; This function might do hidden buffer changes. - (when (looking-at "<") + (when (and c-recognize-<>-arglists + (looking-at "<")) (c-forward-<>-arglist t) (c-forward-syntactic-ws))