From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing Date: Sun, 31 Dec 2017 21:06:31 +0200 Message-ID: <83y3lid8eg.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1514747118 5707 195.159.176.226 (31 Dec 2017 19:05:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 31 Dec 2017 19:05:18 +0000 (UTC) Cc: 29916@debbugs.gnu.org To: Richard Copley , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 31 20:05:13 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eViuz-0000wN-L0 for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Dec 2017 20:05:09 +0100 Original-Received: from localhost ([::1]:48914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eViwx-0000WN-6J for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Dec 2017 14:07:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eViwr-0000W7-Jt for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2017 14:07:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eViwo-0001nm-5M for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2017 14:07:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eViwo-0001mV-1x for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2017 14:07:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eViwn-0007Is-OJ for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2017 14:07:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 31 Dec 2017 19:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29916 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29916-submit@debbugs.gnu.org id=B29916.151474721128058 (code B ref 29916); Sun, 31 Dec 2017 19:07:01 +0000 Original-Received: (at 29916) by debbugs.gnu.org; 31 Dec 2017 19:06:51 +0000 Original-Received: from localhost ([127.0.0.1]:59015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eViwd-0007IT-CM for submit@debbugs.gnu.org; Sun, 31 Dec 2017 14:06:51 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:43749) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eViwc-0007II-6B for 29916@debbugs.gnu.org; Sun, 31 Dec 2017 14:06:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eViwS-0001eh-SY for 29916@debbugs.gnu.org; Sun, 31 Dec 2017 14:06:44 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59409) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eViwS-0001eV-Oi; Sun, 31 Dec 2017 14:06:40 -0500 Original-Received: from [176.228.60.248] (port=2734 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1eViwS-0001GW-8Y; Sun, 31 Dec 2017 14:06:40 -0500 In-reply-to: (message from Richard Copley on Sun, 31 Dec 2017 18:33:56 +0000) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:141658 Archived-At: > From: Richard Copley > Date: Sun, 31 Dec 2017 18:33:56 +0000 > > On Windows, CRLF line endings in the output of diff-command can lead to > an error in `smerge-refine-regions'. To reproduce, download this patch: > > https://lists.gnu.org/archive/html/emacs-devel/2017-06/txtWF9rI8yqfI.txt > > (It is an example of a perfectly ordinary patch, with Unix line endings.) > > >From 'emacs -Q', visit the patch file, do "M-x diff-mode RET", then > move point into the second diff hunk (in editfns.c) and type RET > (diff-goto-source). You mean M-RET, not RET, right? > The minibuffer shows this error, with a literal carriage return, shown > here as ^M: > > Error running timer: (error "Unexpected patch hunk header: 41a42,121^M") I cannot reproduce this. I get "Hunk not yet applied at offset 205 lines" and no error message. Are your Emacs source files checked out with CRLF EOL format or something? If not, where did you get the ported Diff command? > As a data point, the error doesn't happen after applying the attached > patch which partially reverts this commit: I suggest to use utf-8-emacs instead of emacs-mule (you _really_ don't want the latter). I do agree that forcing -unix EOL when decoding the output of Diff is probably wrong. Stefan?