--- Begin Message ---
Subject: |
[PATCH] cc-mode tries to recognize template in non-templated language |
Date: |
Wed, 24 Nov 2010 19:12:05 -0800 |
User-agent: |
Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 |
If a file in c-mode contains constructs that look like C++ templates,
c-mode will try to use parts of the template-matching infrastructure
that have not been initialized.
=== modified file 'lisp/progmodes/cc-engine.el'
--- lisp/progmodes/cc-engine.el 2010-11-15 04:13:16 +0000
+++ lisp/progmodes/cc-engine.el 2010-11-25 03:09:29 +0000
@@ -5889,7 +5889,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))
signature.asc
Description: OpenPGP digital signature
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language |
Date: |
Sun, 12 Dec 2010 13:50:17 +0000 |
User-agent: |
Mutt/1.5.9i |
Hi, Daniel.
On Wed, Nov 24, 2010 at 07:12:05PM -0800, Daniel Colascione wrote:
> If a file in c-mode contains constructs that look like C++ templates,
> c-mode will try to use parts of the template-matching infrastructure
> that have not been initialized.
>
> === modified file 'lisp/progmodes/cc-engine.el'
> --- lisp/progmodes/cc-engine.el 2010-11-15 04:13:16 +0000
> +++ lisp/progmodes/cc-engine.el 2010-11-25 03:09:29 +0000
> @@ -5889,7 +5889,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))
Thanks again for the patch! I've committed it.
--
Alan Mackenzie (Nuremberg, Germany).
--- End Message ---