2 files changed, 7 insertions, 1 deletions

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  <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
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))