From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#11841: 24.1; emacs hangs when opening cpp file with mixed eol styles Date: Sun, 22 Jul 2012 05:54:12 -0400 Message-ID: References: <83lij25d3w.fsf@gnu.org> <20120720211046.GA3822@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1342950881 30803 80.91.229.3 (22 Jul 2012 09:54:41 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 Jul 2012 09:54:41 +0000 (UTC) Cc: 11841@debbugs.gnu.org, Vadim K To: Alan Mackenzie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jul 22 11:54:40 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ssss3-0001Az-Jg for geb-bug-gnu-emacs@m.gmane.org; Sun, 22 Jul 2012 11:54:39 +0200 Original-Received: from localhost ([::1]:40593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ssss2-0004UC-Qf for geb-bug-gnu-emacs@m.gmane.org; Sun, 22 Jul 2012 05:54:38 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ssss0-0004Tw-HM for bug-gnu-emacs@gnu.org; Sun, 22 Jul 2012 05:54:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sssrz-0000oN-LE for bug-gnu-emacs@gnu.org; Sun, 22 Jul 2012 05:54:36 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sssry-0000ng-EJ; Sun, 22 Jul 2012 05:54:34 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SssyD-0002ph-KK; Sun, 22 Jul 2012 06:01:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org, bug-cc-mode@gnu.org Resent-Date: Sun, 22 Jul 2012 10:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11841 X-GNU-PR-Package: emacs,cc-mode X-GNU-PR-Keywords: Original-Received: via spool by 11841-submit@debbugs.gnu.org id=B11841.134295124410855 (code B ref 11841); Sun, 22 Jul 2012 10:01:01 +0000 Original-Received: (at 11841) by debbugs.gnu.org; 22 Jul 2012 10:00:44 +0000 Original-Received: from localhost ([127.0.0.1]:56907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sssxw-0002p2-Kk for submit@debbugs.gnu.org; Sun, 22 Jul 2012 06:00:44 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:53911) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sssxv-0002ov-7c for 11841@debbugs.gnu.org; Sun, 22 Jul 2012 06:00:43 -0400 Original-Received: from fmsmemgm.homelinux.net (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id q6M9sCZG027467; Sun, 22 Jul 2012 05:54:13 -0400 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 6B932AE17C; Sun, 22 Jul 2012 05:54:12 -0400 (EDT) In-Reply-To: <20120720211046.GA3822@acm.acm> (Alan Mackenzie's message of "Fri, 20 Jul 2012 21:10:46 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4286=0 X-NAI-Spam-Version: 2.2.0.9309 : core <4286> : streams <788661> : uri <1171817> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:62268 Archived-At: > --- a/cc-engine.el Sun Apr 22 09:42:29 2012 +0000 > +++ b/cc-engine.el Fri Jul 20 20:52:39 2012 +0000 > @@ -1455,7 +1455,12 @@ > (not (bobp)) > (if (let (open-paren-in-column-0-is-defun-start) > - (forward-comment -1)) > + (or (forward-comment -1) > + ;; Cope specifically with ^M^J here - > + ;; forward-comment gets stuck at ^Ms. > + (and (eq (char-before) ?\r) > + (progn (backward-char) > + (forward-comment -1))))) > (if (looking-at "\\*/") > ;; Emacs <= 20 and XEmacs move back over the > ;; closer of a block comment that lacks an opener. Hard to believe you'd prefer such an ugly workaround instead of just fixing the syntax of ^M. Stefan