From 0e5cf2b8a5566f46cb6c8edcf3d7a6172f491e50 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Sun, 12 Dec 2010 12:24:56 +0000 Subject: [PATCH] (c-forward-type): Before scanning a template arglist, check that the current language supports this. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/cc-engine.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1659f610f7e..dd1b4a400ee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-12-12 Alan Mackenzie + + * progmodes/cc-engine.el (c-forward-type): Before scanning a + template arglist, check that the current language supports this. + 2010-12-11 Glenn Morris * vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 18010407eda..c9e162c91b9 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -5846,7 +5846,8 @@ comment at the start of cc-engine.el for more info." ;; `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)) -- 2.39.5