From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing Date: Mon, 01 Jan 2018 18:23:44 -0500 Message-ID: References: <83y3lid8eg.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1514848936 17923 195.159.176.226 (1 Jan 2018 23:22:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 1 Jan 2018 23:22:16 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Richard Copley , 29916@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jan 02 00:22:12 2018 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 1eW9PC-000453-Qj for geb-bug-gnu-emacs@m.gmane.org; Tue, 02 Jan 2018 00:22:06 +0100 Original-Received: from localhost ([::1]:47744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eW9RB-0001wC-UZ for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Jan 2018 18:24:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eW9R6-0001w2-L1 for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 18:24:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eW9R4-0005Us-Rg for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 18:24:04 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51609) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eW9R4-0005Um-Ns for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 18:24:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eW9R4-0000nw-9C for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 18:24:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Jan 2018 23:24:02 +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.15148490393083 (code B ref 29916); Mon, 01 Jan 2018 23:24:02 +0000 Original-Received: (at 29916) by debbugs.gnu.org; 1 Jan 2018 23:23:59 +0000 Original-Received: from localhost ([127.0.0.1]:60290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eW9R1-0000nf-HK for submit@debbugs.gnu.org; Mon, 01 Jan 2018 18:23:59 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:53333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eW9Qz-0000nX-M2 for 29916@debbugs.gnu.org; Mon, 01 Jan 2018 18:23:58 -0500 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id w01NNkJC010487; Mon, 1 Jan 2018 18:23:49 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 3782D6638C; Mon, 1 Jan 2018 18:23:44 -0500 (EST) In-Reply-To: <83y3lid8eg.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 31 Dec 2017 21:06:31 +0200") X-NAI-Spam-Flag: NO X-NAI-Spam-Level: X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.1 X-NAI-Spam-Rules: 3 Rules triggered GEN_SPAM_FEATRE=0.1, EDT_SA_DN_PASS=0, RV6190=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6190> : inlines <6292> : streams <1774834> : uri <2561410> 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:141703 Archived-At: > 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? I guess utf-8-emacs would work as well, yes (I don't think the forcing of Unix EOL was intended when I changed emacs-mule into emacs-internal). Stefan