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: Mon, 01 Jan 2018 06:37:44 +0200 Message-ID: <83wp12chyf.fsf@gnu.org> References: <83y3lid8eg.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1514781448 23397 195.159.176.226 (1 Jan 2018 04:37:28 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 1 Jan 2018 04:37:28 +0000 (UTC) Cc: monnier@iro.umontreal.ca, 29916@debbugs.gnu.org To: Richard Copley Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jan 01 05:37:24 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 1eVrqc-000590-Sa for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Jan 2018 05:37:14 +0100 Original-Received: from localhost ([::1]:36503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eVrsa-0003CF-CF for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Dec 2017 23:39:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eVrsP-0003Bb-Te for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2017 23:39:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eVrsM-0007Lm-OP for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2017 23:39:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50494) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eVrsM-0007LU-LF for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2017 23:39:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eVrsM-0007Db-FG for bug-gnu-emacs@gnu.org; Sun, 31 Dec 2017 23:39:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Jan 2018 04:39: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.151478148627664 (code B ref 29916); Mon, 01 Jan 2018 04:39:02 +0000 Original-Received: (at 29916) by debbugs.gnu.org; 1 Jan 2018 04:38:06 +0000 Original-Received: from localhost ([127.0.0.1]:59175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eVrrS-0007C7-CO for submit@debbugs.gnu.org; Sun, 31 Dec 2017 23:38:06 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:49309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eVrrQ-0007Bb-0M for 29916@debbugs.gnu.org; Sun, 31 Dec 2017 23:38:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eVrrG-0006LP-0n for 29916@debbugs.gnu.org; Sun, 31 Dec 2017 23:37:58 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eVrrF-0006LL-TB; Sun, 31 Dec 2017 23:37:53 -0500 Original-Received: from [176.228.60.248] (port=3130 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1eVrrE-0000UL-R7; Sun, 31 Dec 2017 23:37:53 -0500 In-reply-to: (message from Richard Copley on Sun, 31 Dec 2017 21:13:21 +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:141673 Archived-At: > From: Richard Copley > Date: Sun, 31 Dec 2017 21:13:21 +0000 > Cc: Stefan Monnier , 29916@debbugs.gnu.org > > >> >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? > > No, with that recipe it is bound to o, , RET, C-c C-c, M-o, > ESC , M-RET, . Sorry, what recipe? It's "emacs -Q", isn't it? After visiting txtWF9rI8yqfI.txt and typing "M-x diff-mode RET", "C-h c RET" says RET is bound to 'newline'. And "C-h w diff-goto-source RET" says diff-goto-source is on C-c C-c, M-o, ESC , M-RET, What am I missing? Why do we get different results both for the command binding and for the recipe? > > If not, where did you get the ported Diff command? > > It's the (ubiquitous) gnuwin32 port of diff 2.8.7. Same here. > > 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? > > Do you mean utf-8, with the end of line conversion left unspecified? > According to the manual (33.10.1), "'emacs-internal’ is an alias for > ‘utf-8-emacs’." "C-h C emacs-internal RET" says: U -- emacs-internal (alias of utf-8-emacs-unix) Support for all Emacs characters (including non-Unicode characters). Type: utf-8 (UTF-8: Emacs internal multibyte form) EOL type: LF So emacs-internal fixes the EOL format at Unix-style LF. By contrast, utf-8-emacs does not: U -- utf-8-emacs Support for all Emacs characters (including non-Unicode characters). Type: utf-8 (UTF-8: Emacs internal multibyte form) EOL type: Automatic selection from: [utf-8-emacs-unix utf-8-emacs-dos utf-8-emacs-mac]