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 18:37:31 +0200 Message-ID: <83k1x1cz78.fsf@gnu.org> References: <83y3lid8eg.fsf@gnu.org> <83wp12chyf.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1514824587 21364 195.159.176.226 (1 Jan 2018 16:36:27 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 1 Jan 2018 16:36:27 +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 17:36:23 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 1eW34S-0004oO-8V for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Jan 2018 17:36:16 +0100 Original-Received: from localhost ([::1]:35602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eW36P-0006UZ-Mj for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Jan 2018 11:38:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eW36E-0006UC-Et for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 11:38:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eW36A-0007Xy-JI for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 11:38:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51368) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eW36A-0007Xr-FN for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 11:38:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eW36A-0005JD-60 for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 11:38: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 16:38: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.151482467020390 (code B ref 29916); Mon, 01 Jan 2018 16:38:02 +0000 Original-Received: (at 29916) by debbugs.gnu.org; 1 Jan 2018 16:37:50 +0000 Original-Received: from localhost ([127.0.0.1]:60049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eW35x-0005In-K6 for submit@debbugs.gnu.org; Mon, 01 Jan 2018 11:37:49 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:33749) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eW35v-0005Ib-C7 for 29916@debbugs.gnu.org; Mon, 01 Jan 2018 11:37:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eW35m-0007Na-7F for 29916@debbugs.gnu.org; Mon, 01 Jan 2018 11:37:42 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eW35m-0007NQ-3N; Mon, 01 Jan 2018 11:37:38 -0500 Original-Received: from [176.228.60.248] (port=3923 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1eW35l-0000bw-Gh; Mon, 01 Jan 2018 11:37:37 -0500 In-reply-to: (message from Richard Copley on Mon, 1 Jan 2018 11:02:18 +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:141693 Archived-At: > From: Richard Copley > Date: Mon, 1 Jan 2018 11:02:18 +0000 > Cc: Stefan Monnier , 29916@debbugs.gnu.org > > > "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] > > OK, thanks. Then I think the sentence I quoted is a documentation bug. Agreed and fixed.