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: Tue, 2 Jan 2018 21:41:03 +0000 Message-ID: References: <83y3lid8eg.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1514929219 31643 195.159.176.226 (2 Jan 2018 21:40:19 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 2 Jan 2018 21:40:19 +0000 (UTC) Cc: 29916@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jan 02 22:40:15 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 1eWUI6-0007ci-BR for geb-bug-gnu-emacs@m.gmane.org; Tue, 02 Jan 2018 22:40:10 +0100 Original-Received: from localhost ([::1]:56482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWUK5-0007Nf-Ha for geb-bug-gnu-emacs@m.gmane.org; Tue, 02 Jan 2018 16:42:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWUJx-0007K7-Ap for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2018 16:42:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWUJu-0004Hp-2e for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2018 16:42:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:53083) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWUJt-0004Gl-VH for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2018 16:42:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eWUJt-0008Qu-Lb for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2018 16:42:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Richard Copley Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 02 Jan 2018 21:42: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.151492930032387 (code B ref 29916); Tue, 02 Jan 2018 21:42:01 +0000 Original-Received: (at 29916) by debbugs.gnu.org; 2 Jan 2018 21:41:40 +0000 Original-Received: from localhost ([127.0.0.1]:33531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eWUJY-0008QJ-LJ for submit@debbugs.gnu.org; Tue, 02 Jan 2018 16:41:40 -0500 Original-Received: from mail-oi0-f50.google.com ([209.85.218.50]:38870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eWUJX-0008Q8-Ju for 29916@debbugs.gnu.org; Tue, 02 Jan 2018 16:41:39 -0500 Original-Received: by mail-oi0-f50.google.com with SMTP id r65so4345167oie.5 for <29916@debbugs.gnu.org>; Tue, 02 Jan 2018 13:41:39 -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; bh=WSaJrBFggC7O3SaMWn/aPHjIoIF9WOHwDDk1KyyKAuU=; b=ZPT3d7qpf8gXjxsmRM/o+okGP69L0jybs2viLValtCNmY68kAQh6EtBheOGRYtmm1s qxhM04P/6OHyhHP/giRyyfqffQEmxzzk3D25yklaVH1ITIRUmBDCBFr3k2c1eNS4lLOE R6MRcfoQWX8AA9uZWhucNPgIpPTidI+SnW7LpB7YksENHOqXCzT4gPxDqp2yZ7dYubZ0 CGiR/tiuxOpCdibGq0SLjv3WRAKkkAM+Ox4tGpOA/dxOmg7vbqOSytLjZ7oIDHQC2laq ykpxWXIO8/NAh6bwKfVL/EKyeAcv7L6++yvAL05aGFeiQ6SbsPbMERSn42IR/DFgh1eE qWlg== 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; bh=WSaJrBFggC7O3SaMWn/aPHjIoIF9WOHwDDk1KyyKAuU=; b=lQ4F+0DY7h8421JbCxL1Zmh6oEefcnob+YZnlfOrIdS2i3eFEaX9tRijhRv/q84AUU RH2Tacl+4qzb5ysBJ5DvKGyaGa9oLcyqoAHhq6RW3nVCG61v3l1hMeSFFsD1+un0IHoc 0fH5yNzEXIqs7sTWYvKKD7rsKNz+ugDDeGLnYYADZd0yoXebwXCHkuqfQQqxSPah4ZYf OwSSR7emk04OWbi6nNqWu+Tv09Ec7yOSy53q8qSCCU3peqhx0RgLPUdqbS/HBQsBfcfz CC8vcniZVoD0W3gzPWyQVEjUJ+D39d1PAX0dVW43dYgBAWVeqUkO1ObHN2GY+hgt2ijD aqwA== X-Gm-Message-State: AKGB3mIc0GrPshBLm5f2Gg9P4FAbYqEnkVYUBOAQ62x6y7TQuJ2fzrCp nPAY4JOHj+jOvjl4NDhQNdXt0tz2T+PhLUiZzxE= X-Google-Smtp-Source: ACJfBov417TRJ2atfiRJZnVrc1iLQ8WzP++MXy5YsS0ffCxf06LKNbRjaihiqYjfk3Fr0U0yCdT2Z3E3Km8YpHr01FM= X-Received: by 10.202.45.205 with SMTP id t196mr34567138oit.15.1514929293775; Tue, 02 Jan 2018 13:41:33 -0800 (PST) Original-Received: by 10.157.6.136 with HTTP; Tue, 2 Jan 2018 13:41:03 -0800 (PST) In-Reply-To: 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:141728 Archived-At: On 1 January 2018 at 23:23, Stefan Monnier wrote: >> 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). Thanks Stefan, Eli, will you make the change please? I don't have write access and I'm not ready to assign copyright. Sorry to be a bother! (Forget about the patch I attached to the report. It wasn't meant to be a proposed solution - it was for a "data point" as I said.)