From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.bugs Subject: bug#7477: [PATCH] cc-mode tries to recognize template in non-templated language Date: Mon, 06 Dec 2010 15:01:27 -0500 Message-ID: <87d3pek6w8.fsf@stupidchicken.com> References: <4CEDD405.7080706@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1291666703 28378 80.91.229.12 (6 Dec 2010 20:18:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 6 Dec 2010 20:18:23 +0000 (UTC) Cc: Daniel Colascione , 7477@debbugs.gnu.org To: Alan Mackenzie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 06 21:18:17 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 1PPhVp-0007ST-9R for geb-bug-gnu-emacs@m.gmane.org; Mon, 06 Dec 2010 21:18:17 +0100 Original-Received: from localhost ([127.0.0.1]:40556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPhVo-0000Tj-KX for geb-bug-gnu-emacs@m.gmane.org; Mon, 06 Dec 2010 15:18:16 -0500 Original-Received: from [140.186.70.92] (port=51150 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPhTL-0007I0-E3 for bug-gnu-emacs@gnu.org; Mon, 06 Dec 2010 15:15:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPhTK-0001jh-DB for bug-gnu-emacs@gnu.org; Mon, 06 Dec 2010 15:15:43 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPhTI-0001ih-Ad; Mon, 06 Dec 2010 15:15:40 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PPhAI-000363-J8; Mon, 06 Dec 2010 14:56:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Chong Yidong 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: Mon, 06 Dec 2010 19:56:02 +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.129166533611866 (code B ref 7477); Mon, 06 Dec 2010 19:56:02 +0000 Original-Received: (at 7477) by debbugs.gnu.org; 6 Dec 2010 19:55:36 +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 1PPh9s-00035L-90 for submit@debbugs.gnu.org; Mon, 06 Dec 2010 14:55:36 -0500 Original-Received: from vm-emlprdomr-04.its.yale.edu ([130.132.50.145]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PPh9q-000352-NB for 7477@debbugs.gnu.org; Mon, 06 Dec 2010 14:55:34 -0500 Original-Received: from furball (dhcp128036014234.central.yale.edu [128.36.14.234]) (authenticated bits=0) by vm-emlprdomr-04.its.yale.edu (8.14.4/8.14.4) with ESMTP id oB6K1RHi021565 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 6 Dec 2010 15:01:27 -0500 Original-Received: by furball (Postfix, from userid 1000) id 7CE58160C98; Mon, 6 Dec 2010 15:01:27 -0500 (EST) In-Reply-To: <4CEDD405.7080706@gmail.com> (Daniel Colascione's message of "Wed, 24 Nov 2010 19:12:05 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-Scanned-By: MIMEDefang 2.71 on 130.132.50.145 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Mon, 06 Dec 2010 14:56:02 -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:42225 Archived-At: 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))