GNU bug report logs - #7477
[PATCH] cc-mode tries to recognize template in non-templated language

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 7477 in the body.
You can then email your comments to 7477 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Daniel Colascione <dan.colascione <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: [PATCH] cc-mode tries to recognize template in non-templated language
Date: Wed, 24 Nov 2010 19:12:05 -0800

[Message part 1 (text/plain, inline)]

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 (application/pgp-signature, attachment)]

Message #8 received at 7477 <at> debbugs.gnu.org (full text, mbox):

From: Chong Yidong <cyd <at> stupidchicken.com>
To: Alan Mackenzie  <acm <at> muc.de>
Cc: Daniel Colascione <dan.colascione <at> gmail.com>, 7477 <at> debbugs.gnu.org
Subject: Re: bug#7477: [PATCH] cc-mode tries to recognize template in
	non-templated language
Date: Mon, 06 Dec 2010 15:01:27 -0500

Hi Alan, could you take a look at this patch?  Thanks.

Daniel Colascione <dan.colascione <at> gmail.com> writes:

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

Message #11 received at 7477 <at> debbugs.gnu.org (full text, mbox):

From: Alan Mackenzie <acm <at> muc.de>
To: Chong Yidong <cyd <at> stupidchicken.com>
Cc: Daniel Colascione <dan.colascione <at> gmail.com>, 7477 <at> debbugs.gnu.org
Subject: Re: bug#7477: [PATCH] cc-mode tries to recognize template in
	non-templated language
Date: Thu, 9 Dec 2010 22:35:49 +0000

Hi, both!

On Mon, Dec 06, 2010 at 03:01:27PM -0500, Chong Yidong wrote:
> Hi Alan, could you take a look at this patch?  Thanks.
> 
> Daniel Colascione <dan.colascione <at> gmail.com> writes:
> 
> > 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))

The patch looks exactly right.  I'll commit it sometime soon.

Thanks, Daniel!

-- 
Alan Mackenzie (Nuremberg, Germany).

Message #16 received at 7477-done <at> debbugs.gnu.org (full text, mbox):

From: Alan Mackenzie <acm <at> muc.de>
To: Daniel Colascione <dan.colascione <at> gmail.com>
Cc: 7477-done <at> debbugs.gnu.org
Subject: Re: bug#7477: [PATCH] cc-mode tries to recognize template in
	non-templated language
Date: Sun, 12 Dec 2010 13:50:17 +0000

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.