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: Sun, 12 Dec 2010 13:50:17 +0000 Message-ID: <20101212135017.GA2831__45413.8510897339$1292161975$gmane$org@muc.de> References: <4CEDD405.7080706@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1292161975 1880 80.91.229.12 (12 Dec 2010 13:52:55 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 12 Dec 2010 13:52:55 +0000 (UTC) Cc: 7477-done@debbugs.gnu.org To: Daniel Colascione Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 12 14:52:51 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 1PRmM7-0002Qn-2e for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Dec 2010 14:52:51 +0100 Original-Received: from localhost ([127.0.0.1]:36255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRmM6-0006Qp-3n for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Dec 2010 08:52:50 -0500 Original-Received: from [140.186.70.92] (port=57665 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRmLv-0006Pa-Rm for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 08:52:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PRmLm-0003Ao-UL for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 08:52:39 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:58062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PRmLg-00035i-5j; Sun, 12 Dec 2010 08:52:24 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PRm03-0008MY-W1; Sun, 12 Dec 2010 08:30:03 -0500 Resent-From: Alan Mackenzie Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: bug-gnu-emacs@gnu.org, bug-cc-mode@gnu.org Resent-Date: Sun, 12 Dec 2010 13:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 7477 X-GNU-PR-Package: emacs,cc-mode X-GNU-PR-Keywords: patch Mail-Followup-To: 7477@debbugs.gnu.org, acm@muc.de Original-Received: via spool by 7477-done@debbugs.gnu.org id=D7477.129216058932109 (code D ref 7477); Sun, 12 Dec 2010 13:30:03 +0000 Original-Received: (at 7477-done) by debbugs.gnu.org; 12 Dec 2010 13:29:49 +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 1PRlzo-0008Lq-T0 for submit@debbugs.gnu.org; Sun, 12 Dec 2010 08:29:49 -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 1PRlzn-0008Le-Gb for 7477-done@debbugs.gnu.org; Sun, 12 Dec 2010 08:29:48 -0500 Original-Received: (qmail 16014 invoked by uid 3782); 12 Dec 2010 13:35:54 -0000 Original-Received: from acm.muc.de (pD9E522DA.dip.t-dialin.net [217.229.34.218]) by colin2.muc.de (tmda-ofmipd) with ESMTP; Sun, 12 Dec 2010 14:35:52 +0100 Original-Received: (qmail 4931 invoked by uid 1000); 12 Dec 2010 13:50:17 -0000 Content-Disposition: inline In-Reply-To: <4CEDD405.7080706@gmail.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: Sun, 12 Dec 2010 08:30:03 -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:42436 Archived-At: 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).