[Emacs-diffs] /srv/bzr/emacs/trunk r102639: (c-forward-type): Before scanning a template arglist, check that the

[Alan Mackenzie]

------------------------------------------------------------
revno: 102639
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Sun 2010-12-12 12:24:56 +0000
message:
  (c-forward-type): Before scanning a template arglist, check that the
  current language supports this.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-engine.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-11 02:54:07 +0000
+++ b/lisp/ChangeLog    2010-12-12 12:24:56 +0000
@@ -1,3 +1,8 @@
+2010-12-12  Alan Mackenzie  <address@hidden>
+
+       * progmodes/cc-engine.el (c-forward-type): Before scanning a
+       template arglist, check that the current language supports this.
+
 2010-12-11  Glenn Morris  <address@hidden>
 
        * vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2010-10-09 19:58:28 +0000
+++ b/lisp/progmodes/cc-engine.el       2010-12-12 12:24:56 +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))