From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.bugs Subject: bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language Date: Thu, 9 Dec 2010 22:35:49 +0000 Message-ID: <20101209223549.GB4636__26789.774062536$1291947984$gmane$org@muc.de> References: <4CEDD405.7080706@gmail.com> <87d3pek6w8.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1291947984 15575 80.91.229.12 (10 Dec 2010 02:26:24 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 10 Dec 2010 02:26:24 +0000 (UTC) Cc: Daniel Colascione , 7477@debbugs.gnu.org To: Chong Yidong Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Dec 10 03:26:20 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PQsgd-0002YT-CM for geb-bug-gnu-emacs@m.gmane.org; Fri, 10 Dec 2010 03:26:19 +0100 Original-Received: from localhost ([127.0.0.1]:48830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQq9V-0007N7-BW for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Dec 2010 18:43:57 -0500 Original-Received: from [140.186.70.92] (port=58738 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQpF2-00077h-W3 for bug-gnu-emacs@gnu.org; Thu, 09 Dec 2010 17:45:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQpF1-00064x-Nv for bug-gnu-emacs@gnu.org; Thu, 09 Dec 2010 17:45:36 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:41356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQpF0-00064S-5b; Thu, 09 Dec 2010 17:45:34 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PQomP-0000qz-Lo; Thu, 09 Dec 2010 17:16:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Alan Mackenzie Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org, bug-cc-mode@gnu.org Resent-Date: Thu, 09 Dec 2010 22:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 7477 X-GNU-PR-Package: emacs,cc-mode X-GNU-PR-Keywords: patch Original-Received: via spool by 7477-submit@debbugs.gnu.org id=B7477.12919329323230 (code B ref 7477); Thu, 09 Dec 2010 22:16:01 +0000 Original-Received: (at 7477) by debbugs.gnu.org; 9 Dec 2010 22:15:32 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PQolv-0000q2-QR for submit@debbugs.gnu.org; Thu, 09 Dec 2010 17:15:32 -0500 Original-Received: from colin.muc.de ([193.149.48.1] helo=mail.muc.de) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PQolt-0000pi-Nd for 7477@debbugs.gnu.org; Thu, 09 Dec 2010 17:15:30 -0500 Original-Received: (qmail 7748 invoked by uid 3782); 9 Dec 2010 22:21:29 -0000 Original-Received: from acm.muc.de (pD9E51688.dip.t-dialin.net [217.229.22.136]) by colin2.muc.de (tmda-ofmipd) with ESMTP; Thu, 09 Dec 2010 23:21:28 +0100 Original-Received: (qmail 5065 invoked by uid 1000); 9 Dec 2010 22:35:49 -0000 Content-Disposition: inline In-Reply-To: <87d3pek6w8.fsf@stupidchicken.com> User-Agent: Mutt/1.5.9i X-Delivery-Agent: TMDA/1.1.5 (Fettercairn) X-Primary-Address: acm@muc.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Thu, 09 Dec 2010 17:16:01 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:42371 Archived-At: 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 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).