unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language
@ 2010-11-25  3:12 Daniel Colascione
  2010-12-06 20:01 ` Chong Yidong
  2010-12-12 13:50 ` Alan Mackenzie
  0 siblings, 2 replies; 4+ messages in thread
From: Daniel Colascione @ 2010-11-25  3:12 UTC (permalink / raw)
  To: 7477

[-- Attachment #1: Type: text/plain, Size: 641 bytes --]

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




[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language
  2010-11-25  3:12 bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language Daniel Colascione
@ 2010-12-06 20:01 ` Chong Yidong
  2010-12-09 22:35   ` Alan Mackenzie
  2010-12-12 13:50 ` Alan Mackenzie
  1 sibling, 1 reply; 4+ messages in thread
From: Chong Yidong @ 2010-12-06 20:01 UTC (permalink / raw)
  To: Alan Mackenzie; +Cc: Daniel Colascione, 7477

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

Daniel Colascione <dan.colascione@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))





^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language
  2010-12-06 20:01 ` Chong Yidong
@ 2010-12-09 22:35   ` Alan Mackenzie
  0 siblings, 0 replies; 4+ messages in thread
From: Alan Mackenzie @ 2010-12-09 22:35 UTC (permalink / raw)
  To: Chong Yidong; +Cc: Daniel Colascione, 7477

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





^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language
  2010-11-25  3:12 bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language Daniel Colascione
  2010-12-06 20:01 ` Chong Yidong
@ 2010-12-12 13:50 ` Alan Mackenzie
  1 sibling, 0 replies; 4+ messages in thread
From: Alan Mackenzie @ 2010-12-12 13:50 UTC (permalink / raw)
  To: Daniel Colascione; +Cc: 7477-done

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





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-12-12 13:50 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-25  3:12 bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language Daniel Colascione
2010-12-06 20:01 ` Chong Yidong
2010-12-09 22:35   ` Alan Mackenzie
2010-12-12 13:50 ` Alan Mackenzie

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).