From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Richard Copley Newsgroups: gmane.emacs.bugs Subject: bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing Date: Mon, 1 Jan 2018 11:02:18 +0000 Message-ID: References: <83y3lid8eg.fsf@gnu.org> <83wp12chyf.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1514804477 12335 195.159.176.226 (1 Jan 2018 11:01:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 1 Jan 2018 11:01:17 +0000 (UTC) Cc: Stefan Monnier , 29916@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jan 01 12:01: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 1eVxqB-0002tE-I2 for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Jan 2018 12:01:11 +0100 Original-Received: from localhost ([::1]:53707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eVxsA-0005Tj-P1 for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Jan 2018 06:03:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eVxs2-0005TZ-Oe for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 06:03:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eVxry-00075u-OE for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 06:03:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50601) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eVxry-00075k-Kb for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 06:03:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eVxry-0001ca-7F for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 06:03:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Richard Copley Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Jan 2018 11:03: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.15148045766221 (code B ref 29916); Mon, 01 Jan 2018 11:03:02 +0000 Original-Received: (at 29916) by debbugs.gnu.org; 1 Jan 2018 11:02:56 +0000 Original-Received: from localhost ([127.0.0.1]:59282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eVxrs-0001cH-Br for submit@debbugs.gnu.org; Mon, 01 Jan 2018 06:02:56 -0500 Original-Received: from mail-ot0-f182.google.com ([74.125.82.182]:38741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eVxrq-0001c1-KW for 29916@debbugs.gnu.org; Mon, 01 Jan 2018 06:02:54 -0500 Original-Received: by mail-ot0-f182.google.com with SMTP id a42so19482259otj.5 for <29916@debbugs.gnu.org>; Mon, 01 Jan 2018 03:02:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=Thj8hGWOlnv+mgxa0St6I2SW+aQHvhVfZqQQBHmMsfE=; b=Ih0Eqyo8v9qWTBfr1PtVd0AeNLkAnYpj51jgC6MqZQfMShONPxnRoBQ5FB1weDARXq ilVUsy6pEKcLGjPFkysyFshWnBriFsL8/0l44xYOpgWhuFK/L1a3chQdoxV6qzUIGqbC HAegK0i8xm+IoPuB/T5h33i4zkQfaffFtJiWYoGfz/vjMveQd6JC9kA13+n/M36BDc1R ARiFzFi7yT3mbELZRpCRi2aiVJo7zMcRjUISvGD0V1lj866C0ftJYetM9vBgAvvmpW37 6O5/iJtCj3pMGERGi9AdUQTutCPEXvUS4THdRHyhJ+6DK3HKlGmZ9ipALDvXkYLpvX0P vwCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=Thj8hGWOlnv+mgxa0St6I2SW+aQHvhVfZqQQBHmMsfE=; b=PhkPCfFGWmBcoP08BDjbXjoNfiAwzXoLk0yYOfCITBo9GobAW4pvtZS9vJniL/Oi+G 9as+jURZ/LqeVlkXFj0/AmNXl5cV9f9zD8ifaJHuo/5PR/xyFyQowBv+lUalnrkXkCzM aOv5ghHZwtDkWrhbfWLI7dh0Mm6JENpl3tNpsfNuLmTMy+6QXZ5YK8ctjBdPXb+5jCX2 DEcq/HrcOJYxm7/rNbBa6vTcu1lSmdv9fOQFppxhfGwJSKKhgo8/Q2eZBP5aiectvsu7 vsdP4LPeN4v3tnHzGsg7VoejcIgF/3fprjyH1lVq5YAds9JhyWDcJf9ahUm+zl9NRorz r7lA== X-Gm-Message-State: AKGB3mKeqLuYfxcJNxR3kkLALR0KA8I2we7wPsClfDTiL1Wur1WHiuQS 5zVsKmn+mZggP+GKSWN1pZGNnekfKtJ9KtMgdaA= X-Google-Smtp-Source: ACJfBovk+hUAbYae3+oWjh2H/RdY/ZTAY0Yg4HMZYDXpKOkFHWjyYQx3Jc/tuENzNIU1FjoCot7BgL66hsj2fomIyKs= X-Received: by 10.157.24.22 with SMTP id b22mr21130193ote.139.1514804568688; Mon, 01 Jan 2018 03:02:48 -0800 (PST) Original-Received: by 10.157.6.136 with HTTP; Mon, 1 Jan 2018 03:02:18 -0800 (PST) In-Reply-To: <83wp12chyf.fsf@gnu.org> 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:141678 Archived-At: > What am I missing? Why do we get different results both for the > command binding and for the recipe? Read-only mode. For some reason, my copy of the patch file has the read-only attribute set. Sorry, I hadn't noticed that. >> > 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=E2=80=99 is an alias= for >> =E2=80=98utf-8-emacs=E2=80=99." > > "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.