GNU bug report logs - #18236
diff-apply-hunk interacts poorly with line endings

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: emacs; Reported by: Reuben Thomas <rrt@HIDDEN>; Keywords: confirmed; dated Sun, 10 Aug 2014 15:35:02 UTC; Maintainer for emacs is bug-gnu-emacs@HIDDEN.
Added tag(s) confirmed. Request was from Noam Postavsky <npostavs@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 18236 <at> debbugs.gnu.org:


Received: (at 18236) by debbugs.gnu.org; 21 Feb 2016 15:56:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 21 10:56:23 2016
Received: from localhost ([127.0.0.1]:36504 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1aXWMx-0006pT-GP
	for submit <at> debbugs.gnu.org; Sun, 21 Feb 2016 10:56:23 -0500
Received: from eggs.gnu.org ([208.118.235.92]:43264)
 by debbugs.gnu.org with esmtp (Exim 4.84)
 (envelope-from <eliz@HIDDEN>) id 1aXWMw-0006pD-CT
 for 18236 <at> debbugs.gnu.org; Sun, 21 Feb 2016 10:56:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <eliz@HIDDEN>) id 1aXWMm-0008Ts-VD
 for 18236 <at> debbugs.gnu.org; Sun, 21 Feb 2016 10:56:17 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD
 autolearn=disabled version=3.3.2
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36651)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@HIDDEN>)
 id 1aXWMm-0008To-Rq; Sun, 21 Feb 2016 10:56:12 -0500
Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4058
 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128)
 (Exim 4.82) (envelope-from <eliz@HIDDEN>)
 id 1aXWMm-00023U-3x; Sun, 21 Feb 2016 10:56:12 -0500
Date: Sun, 21 Feb 2016 17:56:00 +0200
Message-Id: <83a8munjlb.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
To: Marcin Borkowski <mbork@HIDDEN>
In-reply-to: <87fuwmv0gq.fsf@HIDDEN> (message from Marcin Borkowski on Sun, 
 21 Feb 2016 11:09:41 +0100)
Subject: Re: bug#18236: diff-apply-hunk interacts poorly with line endings
References: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
 <87oabfz6xj.fsf@HIDDEN> <83twl7uw8l.fsf@HIDDEN>
 <CAOnWdoghXgQKXCo3Wi5fe+TnhWSBvZ_Q37YvqqWBUHp4h7ouKA@HIDDEN>
 <838u2jumb7.fsf@HIDDEN> <834md3poft.fsf@HIDDEN>
 <CAOnWdoimgyFqLPU5foSxV0NbYok8LcRyTCE4S_Xrd=vJwF56eg@HIDDEN>
 <83ziuvo89k.fsf@HIDDEN> <87fuwmv0gq.fsf@HIDDEN>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 2001:4830:134:3::e
X-Spam-Score: -5.0 (-----)
X-Debbugs-Envelope-To: 18236
Cc: 18236 <at> debbugs.gnu.org, rrt@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Reply-To: Eli Zaretskii <eliz@HIDDEN>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -5.0 (-----)

> From: Marcin Borkowski <mbork@HIDDEN>
> Cc: Reuben Thomas <rrt@HIDDEN>, 18236 <at> debbugs.gnu.org
> Date: Sun, 21 Feb 2016 11:09:41 +0100
> 
> > Marcin, would you like to work on a change along these lines?
> 
> OK, I'll take a look and report in a few days.

Thanks.




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.

Message received at 18236 <at> debbugs.gnu.org:


Received: (at 18236) by debbugs.gnu.org; 21 Feb 2016 10:09:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 21 05:09:56 2016
Received: from localhost ([127.0.0.1]:35793 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1aXQxd-0005Dj-6h
	for submit <at> debbugs.gnu.org; Sun, 21 Feb 2016 05:09:56 -0500
Received: from mail.mojserwer.eu ([195.110.48.8]:34800)
 by debbugs.gnu.org with esmtp (Exim 4.84)
 (envelope-from <mbork@HIDDEN>) id 1aXQxb-0005Db-OQ
 for 18236 <at> debbugs.gnu.org; Sun, 21 Feb 2016 05:09:52 -0500
Received: from localhost (localhost [127.0.0.1])
 by mail.mojserwer.eu (Postfix) with ESMTP id 356539D2005;
 Sun, 21 Feb 2016 11:09:50 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at mail.mojserwer.eu
Received: from mail.mojserwer.eu ([127.0.0.1])
 by localhost (mail.mojserwer.eu [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id xmfcNVUIlLi3; Sun, 21 Feb 2016 11:09:46 +0100 (CET)
Received: from localhost (unknown [109.232.24.28])
 by mail.mojserwer.eu (Postfix) with ESMTPSA id 639509D2004;
 Sun, 21 Feb 2016 11:09:46 +0100 (CET)
References: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
 <87oabfz6xj.fsf@HIDDEN> <83twl7uw8l.fsf@HIDDEN>
 <CAOnWdoghXgQKXCo3Wi5fe+TnhWSBvZ_Q37YvqqWBUHp4h7ouKA@HIDDEN>
 <838u2jumb7.fsf@HIDDEN> <834md3poft.fsf@HIDDEN>
 <CAOnWdoimgyFqLPU5foSxV0NbYok8LcRyTCE4S_Xrd=vJwF56eg@HIDDEN>
 <83ziuvo89k.fsf@HIDDEN>
User-agent: mu4e 0.9.13; emacs 25.1.50.2
From: Marcin Borkowski <mbork@HIDDEN>
To: Eli Zaretskii <eliz@HIDDEN>
Subject: Re: bug#18236: diff-apply-hunk interacts poorly with line endings
In-reply-to: <83ziuvo89k.fsf@HIDDEN>
Date: Sun, 21 Feb 2016 11:09:41 +0100
Message-ID: <87fuwmv0gq.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 18236
Cc: 18236 <at> debbugs.gnu.org, Reuben Thomas <rrt@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)


On 2016-02-20, at 13:50, Eli Zaretskii <eliz@HIDDEN> wrote:

>> Date: Sat, 20 Feb 2016 12:32:03 +0000
>> From: Reuben Thomas <rrt@HIDDEN>
>> Cc: Marcin Borkowski <mbork@HIDDEN>, 18236 <at> debbugs.gnu.org
>> 
>>  The most we can do is display a warning and ask for confirmation when
>>  the values of buffer-file-coding-system differ between the patch
>>  file's buffer and the buffer of file to be patched. Will that be
>>  sufficient?
>> 
>> Thanks for your analysis. ​This solution sounds fine to me: ​as you say, in general it's impossible to tell exactly
>> what went wrong, but we can warn the user so that the unfortunate result I described is not obtained silently.
>
> Marcin, would you like to work on a change along these lines?

OK, I'll take a look and report in a few days.

Best,

-- 
Marcin Borkowski
http://octd.wmi.amu.edu.pl/en/Marcin_Borkowski
Faculty of Mathematics and Computer Science
Adam Mickiewicz University




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.

Message received at 18236 <at> debbugs.gnu.org:


Received: (at 18236) by debbugs.gnu.org; 20 Feb 2016 12:51:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Feb 20 07:51:13 2016
Received: from localhost ([127.0.0.1]:34672 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1aX70D-0004v9-CW
	for submit <at> debbugs.gnu.org; Sat, 20 Feb 2016 07:51:13 -0500
Received: from eggs.gnu.org ([208.118.235.92]:49319)
 by debbugs.gnu.org with esmtp (Exim 4.84)
 (envelope-from <eliz@HIDDEN>) id 1aX70B-0004uw-MP
 for 18236 <at> debbugs.gnu.org; Sat, 20 Feb 2016 07:51:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <eliz@HIDDEN>) id 1aX703-0001ne-5a
 for 18236 <at> debbugs.gnu.org; Sat, 20 Feb 2016 07:51:06 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD
 autolearn=disabled version=3.3.2
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60813)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@HIDDEN>)
 id 1aX703-0001na-29; Sat, 20 Feb 2016 07:51:03 -0500
Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1519
 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128)
 (Exim 4.82) (envelope-from <eliz@HIDDEN>)
 id 1aX702-0001L2-6H; Sat, 20 Feb 2016 07:51:02 -0500
Date: Sat, 20 Feb 2016 14:50:47 +0200
Message-Id: <83ziuvo89k.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
To: Reuben Thomas <rrt@HIDDEN>
In-reply-to: <CAOnWdoimgyFqLPU5foSxV0NbYok8LcRyTCE4S_Xrd=vJwF56eg@HIDDEN>
 (message from Reuben Thomas on Sat, 20 Feb 2016 12:32:03 +0000)
Subject: Re: bug#18236: diff-apply-hunk interacts poorly with line endings
References: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
 <87oabfz6xj.fsf@HIDDEN> <83twl7uw8l.fsf@HIDDEN>
 <CAOnWdoghXgQKXCo3Wi5fe+TnhWSBvZ_Q37YvqqWBUHp4h7ouKA@HIDDEN>
 <838u2jumb7.fsf@HIDDEN> <834md3poft.fsf@HIDDEN>
 <CAOnWdoimgyFqLPU5foSxV0NbYok8LcRyTCE4S_Xrd=vJwF56eg@HIDDEN>
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 2001:4830:134:3::e
X-Spam-Score: -5.0 (-----)
X-Debbugs-Envelope-To: 18236
Cc: mbork@HIDDEN, 18236 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Reply-To: Eli Zaretskii <eliz@HIDDEN>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -5.0 (-----)

> Date: Sat, 20 Feb 2016 12:32:03 +0000
> From: Reuben Thomas <rrt@HIDDEN>
> Cc: Marcin Borkowski <mbork@HIDDEN>, 18236 <at> debbugs.gnu.org
> 
>  The most we can do is display a warning and ask for confirmation when
>  the values of buffer-file-coding-system differ between the patch
>  file's buffer and the buffer of file to be patched. Will that be
>  sufficient?
> 
> Thanks for your analysis. ​This solution sounds fine to me: ​as you say, in general it's impossible to tell exactly
> what went wrong, but we can warn the user so that the unfortunate result I described is not obtained silently.

Marcin, would you like to work on a change along these lines?

The function to use for comparing 2 coding-systems is
`coding-system-equal'.  The idea is to see if the values of
`buffer-file-coding-system' in the patch-file buffer (where the
command is invoked) and in the buffer that visits the file to be
patched (after `find-file-noselect' call in
`diff-find-source-location' returns) are different, and if so, ask the
user for confirmation.  Ideally, the confirmation should only be
requested once, when applying the 1st hunk from the patch file.

Thanks.




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.

Message received at 18236 <at> debbugs.gnu.org:


Received: (at 18236) by debbugs.gnu.org; 20 Feb 2016 12:32:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Feb 20 07:32:10 2016
Received: from localhost ([127.0.0.1]:34667 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1aX6hm-0004U2-O4
	for submit <at> debbugs.gnu.org; Sat, 20 Feb 2016 07:32:10 -0500
Received: from mail-ig0-f177.google.com ([209.85.213.177]:38882)
 by debbugs.gnu.org with esmtp (Exim 4.84)
 (envelope-from <rrt@HIDDEN>) id 1aX6hl-0004RM-22
 for 18236 <at> debbugs.gnu.org; Sat, 20 Feb 2016 07:32:09 -0500
Received: by mail-ig0-f177.google.com with SMTP id y8so53084391igp.1
 for <18236 <at> debbugs.gnu.org>; Sat, 20 Feb 2016 04:32:09 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=aDnT6SJyrcCwVwyl/VYze3gYTsDMTcw4MJN+ScIgYpk=;
 b=Ql9QH7+Zjkru20XZTfWjKus58ripSk4Kez+qHNKVf7tCx9YcnQgvM3QdZ2ScjoMiCP
 jdmmZJbwWum9NqOLxkN48F/mIUNKJNzu+Eb74kwYR0ZoaFXpKZRTC9ULj6Z0TcbKjhQF
 IO4akJ6UDmChsTSCRXLWpuOnmc1wXXT8a6X80=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:mime-version:in-reply-to:references:date
 :message-id:subject:from:to:cc:content-type;
 bh=aDnT6SJyrcCwVwyl/VYze3gYTsDMTcw4MJN+ScIgYpk=;
 b=ZRAjXcpntaEhDFtpNA6kLU6WjDRbcNJGJKLDNHiazefNkBdCzFG2pn1QOgZIWZ+NfM
 YM9/7iW6Bmf1WFOoIoe7qkDwvhw/oE2IrFmAYeDSIUcEcXDZ5GJbDj7FJqw01k9cac9d
 Pzo5D9OfmTghwvJItTpY9zwdNnAPsosYl2ZyUjOs/CB1dIq+ZJP+QeO1046kirTZsa9R
 FtgWTEZ+eQdUFqpTJVrjP9ZGCFv5/11OkMHyVrpbj5Qzra1YtJ9qbKALmQ+A+UGNEQLM
 47rfH2Gyg3blVKNN7G4dp3L61a8m5YuC7YxbcO+moH0wrLp/iFRoq23rizK4Y/QacT/1
 DqgA==
X-Gm-Message-State: AG10YOSnqusvkmCWU63nHw7WwyucLOy3xrbxOS4hR+Wz+P6+YRWEfKtyURsvlLrSN+PHzN6QIsdvD/MgTXfwZGjs
MIME-Version: 1.0
X-Received: by 10.50.61.132 with SMTP id p4mr1971338igr.55.1455971523537; Sat,
 20 Feb 2016 04:32:03 -0800 (PST)
Received: by 10.36.199.5 with HTTP; Sat, 20 Feb 2016 04:32:03 -0800 (PST)
In-Reply-To: <834md3poft.fsf@HIDDEN>
References: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
 <87oabfz6xj.fsf@HIDDEN> <83twl7uw8l.fsf@HIDDEN>
 <CAOnWdoghXgQKXCo3Wi5fe+TnhWSBvZ_Q37YvqqWBUHp4h7ouKA@HIDDEN>
 <838u2jumb7.fsf@HIDDEN> <834md3poft.fsf@HIDDEN>
Date: Sat, 20 Feb 2016 12:32:03 +0000
Message-ID: <CAOnWdoimgyFqLPU5foSxV0NbYok8LcRyTCE4S_Xrd=vJwF56eg@HIDDEN>
Subject: Re: bug#18236: diff-apply-hunk interacts poorly with line endings
From: Reuben Thomas <rrt@HIDDEN>
To: Eli Zaretskii <eliz@HIDDEN>
Content-Type: multipart/alternative; boundary=047d7bdc15ea76c985052c32c990
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 18236
Cc: Marcin Borkowski <mbork@HIDDEN>, 18236 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)

--047d7bdc15ea76c985052c32c990
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On 20 February 2016 at 12:16, Eli Zaretskii <eliz@HIDDEN> wrote:

>
> The most we can do is display a warning and ask for confirmation when
> the values of buffer-file-coding-system differ between the patch
> file's buffer and the buffer of file to be patched.  Will that be
> sufficient?
>

Thanks for your analysis. =E2=80=8BThis solution sounds fine to me: =E2=80=
=8Bas you say, in
general it's impossible to tell exactly what went wrong, but we can warn
the user so that the unfortunate result I described is not obtained
silently.

--=20
http://rrt.sc3d.org

--047d7bdc15ea76c985052c32c990
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div class=3D"gmail_default" style=3D"font-size:small">On =
20 February 2016 at 12:16, Eli Zaretskii <span dir=3D"ltr">&lt;<a href=3D"m=
ailto:eliz@HIDDEN" target=3D"_blank">eliz@HIDDEN</a>&gt;</span> wrote:<br=
></div><div class=3D"gmail_extra"><div class=3D"gmail_quote"><blockquote cl=
ass=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;p=
adding-left:1ex"><br>
The most we can do is display a warning and ask for confirmation when<br>
the values of buffer-file-coding-system differ between the patch<br>
file&#39;s buffer and the buffer of file to be patched.=C2=A0 Will that be<=
br>
sufficient?<br>
</blockquote></div><br><div class=3D"gmail_default" style=3D"font-size:smal=
l">Thanks for your analysis. =E2=80=8BThis solution sounds fine to me: =E2=
=80=8Bas you say, in general it&#39;s impossible to tell exactly what went =
wrong, but we can warn the user so that the unfortunate result I described =
is not obtained silently.</div><div><br></div>-- <br><div class=3D"gmail_si=
gnature"><a href=3D"http://rrt.sc3d.org" target=3D"_blank">http://rrt.sc3d.=
org</a></div>
</div></div>

--047d7bdc15ea76c985052c32c990--




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.

Message received at 18236 <at> debbugs.gnu.org:


Received: (at 18236) by debbugs.gnu.org; 20 Feb 2016 12:16:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Feb 20 07:16:32 2016
Received: from localhost ([127.0.0.1]:34658 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1aX6Se-0002TF-2D
	for submit <at> debbugs.gnu.org; Sat, 20 Feb 2016 07:16:32 -0500
Received: from eggs.gnu.org ([208.118.235.92]:41827)
 by debbugs.gnu.org with esmtp (Exim 4.84)
 (envelope-from <eliz@HIDDEN>) id 1aX6Sd-0002T2-64
 for 18236 <at> debbugs.gnu.org; Sat, 20 Feb 2016 07:16:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <eliz@HIDDEN>) id 1aX6SU-00023O-NF
 for 18236 <at> debbugs.gnu.org; Sat, 20 Feb 2016 07:16:25 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD
 autolearn=disabled version=3.3.2
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60240)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@HIDDEN>)
 id 1aX6SU-00023I-JY; Sat, 20 Feb 2016 07:16:22 -0500
Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1479
 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128)
 (Exim 4.82) (envelope-from <eliz@HIDDEN>)
 id 1aX6ST-0004cO-Sy; Sat, 20 Feb 2016 07:16:22 -0500
Date: Sat, 20 Feb 2016 14:16:06 +0200
Message-Id: <834md3poft.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
To: Reuben Thomas <rrt@HIDDEN>
In-reply-to: <838u2jumb7.fsf@HIDDEN> (message from Eli Zaretskii on Wed, 17
 Feb 2016 22:14:04 +0200)
Subject: Re: bug#18236: diff-apply-hunk interacts poorly with line endings
References: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
 <87oabfz6xj.fsf@HIDDEN> <83twl7uw8l.fsf@HIDDEN>
 <CAOnWdoghXgQKXCo3Wi5fe+TnhWSBvZ_Q37YvqqWBUHp4h7ouKA@HIDDEN>
 <838u2jumb7.fsf@HIDDEN>
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 2001:4830:134:3::e
X-Spam-Score: -5.0 (-----)
X-Debbugs-Envelope-To: 18236
Cc: mbork@HIDDEN, 18236 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Reply-To: Eli Zaretskii <eliz@HIDDEN>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -5.0 (-----)

> Date: Wed, 17 Feb 2016 22:14:04 +0200
> From: Eli Zaretskii <eliz@HIDDEN>
> Cc: mbork@HIDDEN, 18236 <at> debbugs.gnu.org
> 
> > Date: Wed, 17 Feb 2016 19:59:02 +0000
> > From: Reuben Thomas <rrt@HIDDEN>
> > Cc: Marcin Borkowski <mbork@HIDDEN>, 18236 <at> debbugs.gnu.org
> > 
> >  Is the recipe
> >  ​ ​
> >  complete?
> > 
> > ​Seems so.​
> > 
> > 
> >  Also, does this happen on a Posix host or on a Windows box?
> > 
> > 
> > ​On a GNU/Linux system.​
> > 
> > 
> >  If the former, I won't expect each line in the patch file to end with
> >  a ^M, only the lines that came from the files being diffed.
> > 
> > 
> > Sorry, I was imprecise. ​You're quite right, only the lines that come from the files being diffed end in ^M.​
> > 
> > However, the original problem ​remains, as stated: after applying the patch hunk, the patched lines of the
> > resultant file "bar" end \r\r\n.
> 
> Doesn't happen on Windows.  I will try on GNU/Linux and see what I
> find there.

I see the problem, but I don't see how this could be solved, in
general.

This problem will always happen when the patch file and the file to be
patched are visited in Emacs using different values of
buffer-file-coding-system.  The problem is not limited to the EOL
format, it can also happen with the text encoding, e.g. if the patch
file is visited using raw-text and the file to be patched uses Latin-1
or some such.

In the case in point, the patch file is visited using the -unix EOL,
whereas the file to be patched is visited using -dos.  If you force
Emacs to visit the patch file using -dos, e.g. by using
"C-x RET c dos RET C-x C-f", then the problem goes away.

I don't see how we can solve this.  We cannot assume that the ^M
characters in the patch file's buffer should be omitted, because they
could really belong to the hunk.  The Patch utility does TRT in this
case because it effectively reads the files as bytes.  The equivalent
in Emacs is to visit the files with no-conversion, but if we do that,
the patched file will be displayed to the user without decoding, which
is not good.

The most we can do is display a warning and ask for confirmation when
the values of buffer-file-coding-system differ between the patch
file's buffer and the buffer of file to be patched.  Will that be
sufficient?




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.

Message received at 18236 <at> debbugs.gnu.org:


Received: (at 18236) by debbugs.gnu.org; 17 Feb 2016 20:14:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 17 15:14:02 2016
Received: from localhost ([127.0.0.1]:59991 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1aW8U5-0001sc-NF
	for submit <at> debbugs.gnu.org; Wed, 17 Feb 2016 15:14:02 -0500
Received: from eggs.gnu.org ([208.118.235.92]:37121)
 by debbugs.gnu.org with esmtp (Exim 4.84)
 (envelope-from <eliz@HIDDEN>) id 1aW8U3-0001s4-SC
 for 18236 <at> debbugs.gnu.org; Wed, 17 Feb 2016 15:14:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <eliz@HIDDEN>) id 1aW8Tv-0002Qe-H3
 for 18236 <at> debbugs.gnu.org; Wed, 17 Feb 2016 15:13:54 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD
 autolearn=disabled version=3.3.2
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59928)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@HIDDEN>)
 id 1aW8Tv-0002QY-DW; Wed, 17 Feb 2016 15:13:51 -0500
Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4890
 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128)
 (Exim 4.82) (envelope-from <eliz@HIDDEN>)
 id 1aW8Tu-00075Q-NS; Wed, 17 Feb 2016 15:13:51 -0500
Date: Wed, 17 Feb 2016 22:14:04 +0200
Message-Id: <838u2jumb7.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
To: Reuben Thomas <rrt@HIDDEN>
In-reply-to: <CAOnWdoghXgQKXCo3Wi5fe+TnhWSBvZ_Q37YvqqWBUHp4h7ouKA@HIDDEN>
 (message from Reuben Thomas on Wed, 17 Feb 2016 19:59:02 +0000)
Subject: Re: bug#18236: diff-apply-hunk interacts poorly with line endings
References: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
 <87oabfz6xj.fsf@HIDDEN> <83twl7uw8l.fsf@HIDDEN>
 <CAOnWdoghXgQKXCo3Wi5fe+TnhWSBvZ_Q37YvqqWBUHp4h7ouKA@HIDDEN>
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 2001:4830:134:3::e
X-Spam-Score: -5.0 (-----)
X-Debbugs-Envelope-To: 18236
Cc: mbork@HIDDEN, 18236 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Reply-To: Eli Zaretskii <eliz@HIDDEN>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -5.0 (-----)

> Date: Wed, 17 Feb 2016 19:59:02 +0000
> From: Reuben Thomas <rrt@HIDDEN>
> Cc: Marcin Borkowski <mbork@HIDDEN>, 18236 <at> debbugs.gnu.org
> 
>  Is the recipe
>  ​ ​
>  complete?
> 
> ​Seems so.​
> 
> 
>  Also, does this happen on a Posix host or on a Windows box?
> 
> 
> ​On a GNU/Linux system.​
> 
> 
>  If the former, I won't expect each line in the patch file to end with
>  a ^M, only the lines that came from the files being diffed.
> 
> 
> Sorry, I was imprecise. ​You're quite right, only the lines that come from the files being diffed end in ^M.​
> 
> However, the original problem ​remains, as stated: after applying the patch hunk, the patched lines of the
> resultant file "bar" end \r\r\n.

Doesn't happen on Windows.  I will try on GNU/Linux and see what I
find there.




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.

Message received at 18236 <at> debbugs.gnu.org:


Received: (at 18236) by debbugs.gnu.org; 17 Feb 2016 19:59:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 17 14:59:10 2016
Received: from localhost ([127.0.0.1]:59987 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1aW8Fi-0001XJ-8L
	for submit <at> debbugs.gnu.org; Wed, 17 Feb 2016 14:59:10 -0500
Received: from mail-io0-f169.google.com ([209.85.223.169]:33642)
 by debbugs.gnu.org with esmtp (Exim 4.84)
 (envelope-from <rrt@HIDDEN>) id 1aW8Fg-0001X7-Ku
 for 18236 <at> debbugs.gnu.org; Wed, 17 Feb 2016 14:59:09 -0500
Received: by mail-io0-f169.google.com with SMTP id z135so49737781iof.0
 for <18236 <at> debbugs.gnu.org>; Wed, 17 Feb 2016 11:59:08 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=Fcv08Pny8pK4eUaIVYTHKkhvioF1OufkxLdNxClHdEI=;
 b=2BZpR4GkYnKQrnVMM49PHk4JRyGOWXOMFklZkwa6Nz5VOY1LKRsLID0UEgf3h1qCTR
 IuI/49PoboHkp2sGYR+RPLBqkWnqn6cXfuJoVuLuDrq3QWaK+PP93Tx/7BvzYQFsntht
 yaFS964WfsBKpG2zaLTMgttypOfJ80MDEEdMQ=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:mime-version:in-reply-to:references:date
 :message-id:subject:from:to:cc:content-type;
 bh=Fcv08Pny8pK4eUaIVYTHKkhvioF1OufkxLdNxClHdEI=;
 b=icD5UVg0myvRMv/vbWRKMq/0quqcf330FLT4Zhsq8Cu/HXEHxCUcmcdX55z3aQZxDD
 rov1U/UCxsexd4AxbnQpU5zyB8+ks5skqtF289wSu8aP6273ZsUN2g/pdHI2BGF5JBe8
 HhypS/D8muzjaAz/CPpeOROeHnj8ovzRZI0AvIKRMUTuib/yAvHo9O/wnb/5EC2NNb/1
 YlnFO0EsnIXQQgC8VVoniUmdp/mVZmIlxl0opm1Zz+7gVVNecETAikyFzz3NkdPoN0k/
 lVK+A/5W8ql+ZrrwpjaxJVfUdUJWzRKUAIiVjGm+0qkQml97UtgIDFmxkynqfnPFQC6B
 fvnw==
X-Gm-Message-State: AG10YOQ6ho7XZiuDmQvyT4aSSy7nH0okWOeP2B39xFa+KbPvy06plBUch6r7r8+UPhPECxv2uIk6yzRhWo/R4aB+
MIME-Version: 1.0
X-Received: by 10.107.6.82 with SMTP id 79mr5034560iog.72.1455739143010; Wed,
 17 Feb 2016 11:59:03 -0800 (PST)
Received: by 10.36.199.5 with HTTP; Wed, 17 Feb 2016 11:59:02 -0800 (PST)
In-Reply-To: <83twl7uw8l.fsf@HIDDEN>
References: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
 <87oabfz6xj.fsf@HIDDEN> <83twl7uw8l.fsf@HIDDEN>
Date: Wed, 17 Feb 2016 19:59:02 +0000
Message-ID: <CAOnWdoghXgQKXCo3Wi5fe+TnhWSBvZ_Q37YvqqWBUHp4h7ouKA@HIDDEN>
Subject: Re: bug#18236: diff-apply-hunk interacts poorly with line endings
From: Reuben Thomas <rrt@HIDDEN>
To: Eli Zaretskii <eliz@HIDDEN>
Content-Type: multipart/alternative; boundary=001a113edff48152d0052bfcae91
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 18236
Cc: Marcin Borkowski <mbork@HIDDEN>, 18236 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)

--001a113edff48152d0052bfcae91
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On 17 February 2016 at 16:39, Eli Zaretskii <eliz@HIDDEN> wrote:

> > From: Marcin Borkowski <mbork@HIDDEN>
> > Date: Wed, 17 Feb 2016 16:35:04 +0100
> > Cc: 18236 <at> debbugs.gnu.org
> >
> > On 2014-08-10, at 17:34, Reuben Thomas <rrt@HIDDEN> wrote:
> >
> > > I'm using Emacs 24.3. Consider the following two files:
> > >
> > > foo:
> > > ----cut here----
> > > This is a small test file.
> > > It has DOS line endings.
> > > ----cut here----
> > >
> > > bar:
> > > ----cut here----
> > > This is a small test file.
> > > It too has DOS line endings.
> > > ----cut here----
> > >
> > > Save them with DOS line endings, and
> > >
> > > diff foo bar > foo.patch
> > > cp foo bar
> > >
> > > Visit foo.patch. When I do that, each line ends in ^M.
> > >
> > > Now, in the patch buffer, M-x diff-apply-hunk. Note that the ^Ms have
> been added to the lines. Writing the buffer and examination with "hd"
> reveals that each line now ends
> > > \r\r\n.
> > >
> > > It seems what's happened here is that diff-mode doesn't try to
> diagnose the character encoding of the patch file.
> >
> > Hi all,
> >
> > confirmed on GNU Emacs 25.1.50.2 (commit 4ccd268).
>
> When I try doing that, I get an error message.


=E2=80=8BI just repeated the recipe, now in Emacs 24.4. It worked as descri=
bed.=E2=80=8B


> Is the recipe
> =E2=80=8B =E2=80=8B
> complete?


=E2=80=8BSeems so.=E2=80=8B


> Also, does this happen on a Posix host or on a Windows box?
>

=E2=80=8BOn a GNU/Linux system.=E2=80=8B


> If the former, I won't expect each line in the patch file to end with
> a ^M, only the lines that came from the files being diffed.
>

Sorry, I was imprecise. =E2=80=8BYou're quite right, only the lines that co=
me from
the files being diffed end in ^M.=E2=80=8B

However, the original problem =E2=80=8Bremains, as stated: after applying t=
he patch
hunk, the patched lines of the resultant file "bar" end \r\r\n.

--=20
http://rrt.sc3d.org

--001a113edff48152d0052bfcae91
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div class=3D"gmail_default" style=3D"font-size:small">On =
17 February 2016 at 16:39, Eli Zaretskii <span dir=3D"ltr">&lt;<a href=3D"m=
ailto:eliz@HIDDEN" target=3D"_blank">eliz@HIDDEN</a>&gt;</span> wrote:<br=
></div><div class=3D"gmail_extra"><div class=3D"gmail_quote"><blockquote cl=
ass=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;p=
adding-left:1ex">&gt; From: Marcin Borkowski &lt;<a href=3D"mailto:mbork@mb=
ork.pl">mbork@HIDDEN</a>&gt;<br>
&gt; Date: Wed, 17 Feb 2016 16:35:04 +0100<br>
&gt; Cc: <a href=3D"mailto:18236 <at> debbugs.gnu.org">18236 <at> debbugs.gnu.org</a>=
<br>
<span class=3D"">&gt;<br>
&gt; On 2014-08-10, at 17:34, Reuben Thomas &lt;<a href=3D"mailto:rrt@sc3d.=
org">rrt@HIDDEN</a>&gt; wrote:<br>
&gt;<br>
&gt; &gt; I&#39;m using Emacs 24.3. Consider the following two files:<br>
&gt; &gt;<br>
&gt; &gt; foo:<br>
&gt; &gt; ----cut here----<br>
&gt; &gt; This is a small test file.<br>
&gt; &gt; It has DOS line endings.<br>
&gt; &gt; ----cut here----<br>
&gt; &gt;<br>
&gt; &gt; bar:<br>
&gt; &gt; ----cut here----<br>
&gt; &gt; This is a small test file.<br>
&gt; &gt; It too has DOS line endings.<br>
&gt; &gt; ----cut here----<br>
&gt; &gt;<br>
&gt; &gt; Save them with DOS line endings, and<br>
&gt; &gt;<br>
&gt; &gt; diff foo bar &gt; foo.patch<br>
&gt; &gt; cp foo bar<br>
&gt; &gt;<br>
&gt; &gt; Visit foo.patch. When I do that, each line ends in ^M.<br>
&gt; &gt;<br>
&gt; &gt; Now, in the patch buffer, M-x diff-apply-hunk. Note that the ^Ms =
have been added to the lines. Writing the buffer and examination with &quot=
;hd&quot; reveals that each line now ends<br>
&gt; &gt; \r\r\n.<br>
&gt; &gt;<br>
&gt; &gt; It seems what&#39;s happened here is that diff-mode doesn&#39;t t=
ry to diagnose the character encoding of the patch file.<br>
&gt;<br>
&gt; Hi all,<br>
&gt;<br>
&gt; confirmed on GNU Emacs 25.1.50.2 (commit 4ccd268).<br>
<br>
</span>When I try doing that, I get an error message.</blockquote><div><br>=
</div><div><div class=3D"gmail_default" style=3D"font-size:small">=E2=80=8B=
I just repeated the recipe, now in Emacs 24.4. It worked as described.=E2=
=80=8B</div></div><div>=C2=A0</div><blockquote class=3D"gmail_quote" style=
=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Is the r=
ecipe<div class=3D"gmail_default" style=3D"font-size:small;display:inline">=
=E2=80=8B =E2=80=8B</div>complete?</blockquote><div><br></div><div><div cla=
ss=3D"gmail_default" style=3D"font-size:small">=E2=80=8BSeems so.=E2=80=8B<=
/div></div><div>=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"marg=
in:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Also, does this =
happen on a Posix host or on a Windows box?<br></blockquote><div><br></div>=
<div><div class=3D"gmail_default" style=3D"font-size:small">=E2=80=8BOn a G=
NU/Linux system.=E2=80=8B</div></div><div>=C2=A0</div><blockquote class=3D"=
gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-=
left:1ex">
If the former, I won&#39;t expect each line in the patch file to end with<b=
r>
a ^M, only the lines that came from the files being diffed.<br></blockquote=
><div><br></div><div><div class=3D"gmail_default" style=3D"font-size:small"=
>Sorry, I was imprecise. =E2=80=8BYou&#39;re quite right, only the lines th=
at come from the files being diffed end in ^M.=E2=80=8B</div></div></div><d=
iv><br></div><div><div class=3D"gmail_default" style=3D"font-size:small">Ho=
wever, the original problem =E2=80=8Bremains, as stated: after applying the=
 patch hunk, the patched lines of the resultant file &quot;bar&quot; end \r=
\r\n.</div></div><div><br></div>-- <br><div class=3D"gmail_signature"><a hr=
ef=3D"http://rrt.sc3d.org" target=3D"_blank">http://rrt.sc3d.org</a></div>
</div></div>

--001a113edff48152d0052bfcae91--




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.

Message received at 18236 <at> debbugs.gnu.org:


Received: (at 18236) by debbugs.gnu.org; 17 Feb 2016 16:56:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 17 11:56:36 2016
Received: from localhost ([127.0.0.1]:59797 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1aW5P1-0000cb-Qw
	for submit <at> debbugs.gnu.org; Wed, 17 Feb 2016 11:56:36 -0500
Received: from eggs.gnu.org ([208.118.235.92]:40573)
 by debbugs.gnu.org with esmtp (Exim 4.84)
 (envelope-from <eliz@HIDDEN>) id 1aW5P0-0000cM-IQ
 for 18236 <at> debbugs.gnu.org; Wed, 17 Feb 2016 11:56:35 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <eliz@HIDDEN>) id 1aW58Q-0001YD-76
 for 18236 <at> debbugs.gnu.org; Wed, 17 Feb 2016 11:39:30 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RP_MATCHES_RCVD
 autolearn=disabled version=3.3.2
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55930)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@HIDDEN>)
 id 1aW58Q-0001Y6-3Y; Wed, 17 Feb 2016 11:39:26 -0500
Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4684
 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128)
 (Exim 4.82) (envelope-from <eliz@HIDDEN>)
 id 1aW58P-0001HM-Em; Wed, 17 Feb 2016 11:39:25 -0500
Date: Wed, 17 Feb 2016 18:39:38 +0200
Message-Id: <83twl7uw8l.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
To: Marcin Borkowski <mbork@HIDDEN>
In-reply-to: <87oabfz6xj.fsf@HIDDEN> (message from Marcin Borkowski on Wed, 
 17 Feb 2016 16:35:04 +0100)
Subject: Re: bug#18236: diff-apply-hunk interacts poorly with line endings
References: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
 <87oabfz6xj.fsf@HIDDEN>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 2001:4830:134:3::e
X-Spam-Score: -5.0 (-----)
X-Debbugs-Envelope-To: 18236
Cc: 18236 <at> debbugs.gnu.org, rrt@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Reply-To: Eli Zaretskii <eliz@HIDDEN>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -5.0 (-----)

> From: Marcin Borkowski <mbork@HIDDEN>
> Date: Wed, 17 Feb 2016 16:35:04 +0100
> Cc: 18236 <at> debbugs.gnu.org
> 
> On 2014-08-10, at 17:34, Reuben Thomas <rrt@HIDDEN> wrote:
> 
> > I'm using Emacs 24.3. Consider the following two files:
> >
> > foo:
> > ----cut here----
> > This is a small test file.
> > It has DOS line endings.
> > ----cut here----
> >
> > bar:
> > ----cut here----
> > This is a small test file. 
> > It too has DOS line endings. 
> > ----cut here----
> >
> > Save them with DOS line endings, and
> >
> > diff foo bar > foo.patch
> > cp foo bar
> >
> > Visit foo.patch. When I do that, each line ends in ^M.
> >
> > Now, in the patch buffer, M-x diff-apply-hunk. Note that the ^Ms have been added to the lines. Writing the buffer and examination with "hd" reveals that each line now ends
> > \r\r\n.
> >
> > It seems what's happened here is that diff-mode doesn't try to diagnose the character encoding of the patch file.
> 
> Hi all,
> 
> confirmed on GNU Emacs 25.1.50.2 (commit 4ccd268).

When I try doing that, I get an error message.  Is the recipe
complete?  Also, does this happen on a Posix host or on a Windows box?
If the former, I won't expect each line in the patch file to end with
a ^M, only the lines that came from the files being diffed.

I'm confused.





Information forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.

Message received at 18236 <at> debbugs.gnu.org:


Received: (at 18236) by debbugs.gnu.org; 17 Feb 2016 15:35:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 17 10:35:17 2016
Received: from localhost ([127.0.0.1]:39773 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1aW48L-0001D4-JS
	for submit <at> debbugs.gnu.org; Wed, 17 Feb 2016 10:35:17 -0500
Received: from mail.mojserwer.eu ([195.110.48.8]:41036)
 by debbugs.gnu.org with esmtp (Exim 4.84)
 (envelope-from <mbork@HIDDEN>) id 1aW48J-0001Cv-NJ
 for 18236 <at> debbugs.gnu.org; Wed, 17 Feb 2016 10:35:16 -0500
Received: from localhost (localhost [127.0.0.1])
 by mail.mojserwer.eu (Postfix) with ESMTP id 5AC1A9D2004;
 Wed, 17 Feb 2016 16:35:13 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at mail.mojserwer.eu
Received: from mail.mojserwer.eu ([127.0.0.1])
 by localhost (mail.mojserwer.eu [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id W2lA16NnoJPP; Wed, 17 Feb 2016 16:35:05 +0100 (CET)
Received: from localhost (unknown [IPv6:2001:808:114:6:a288:b4ff:fe90:5e24])
 by mail.mojserwer.eu (Postfix) with ESMTPSA id 3870A9D2003;
 Wed, 17 Feb 2016 16:35:05 +0100 (CET)
From: Marcin Borkowski <mbork@HIDDEN>
To: Reuben Thomas <rrt@HIDDEN>
Subject: Re: bug#18236: diff-apply-hunk interacts poorly with line endings
References: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
Date: Wed, 17 Feb 2016 16:35:04 +0100
In-Reply-To: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
 (Reuben Thomas's message of "Sun, 10 Aug 2014 16:34:23 +0100")
Message-ID: <87oabfz6xj.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 18236
Cc: 18236 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)

On 2014-08-10, at 17:34, Reuben Thomas <rrt@HIDDEN> wrote:

> I'm using Emacs 24.3. Consider the following two files:
>
> foo:
> ----cut here----
> This is a small test file.
> It has DOS line endings.
> ----cut here----
>
> bar:
> ----cut here----
> This is a small test file. 
> It too has DOS line endings. 
> ----cut here----
>
> Save them with DOS line endings, and
>
> diff foo bar > foo.patch
> cp foo bar
>
> Visit foo.patch. When I do that, each line ends in ^M.
>
> Now, in the patch buffer, M-x diff-apply-hunk. Note that the ^Ms have been added to the lines. Writing the buffer and examination with "hd" reveals that each line now ends
> \r\r\n.
>
> It seems what's happened here is that diff-mode doesn't try to diagnose the character encoding of the patch file.

Hi all,

confirmed on GNU Emacs 25.1.50.2 (commit 4ccd268).

Best,

--
Marcin Borkowski




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 10 Aug 2014 15:34:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 10 11:34:40 2014
Received: from localhost ([127.0.0.1]:37845 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1XGV8p-0005vX-4F
	for submit <at> debbugs.gnu.org; Sun, 10 Aug 2014 11:34:39 -0400
Received: from eggs.gnu.org ([208.118.235.92]:50075)
 by debbugs.gnu.org with esmtp (Exim 4.80)
 (envelope-from <rrt@HIDDEN>) id 1XGV8l-0005vI-2B
 for submit <at> debbugs.gnu.org; Sun, 10 Aug 2014 11:34:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <rrt@HIDDEN>) id 1XGV8e-00075p-Qs
 for submit <at> debbugs.gnu.org; Sun, 10 Aug 2014 11:34:29 -0400
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,HTML_MESSAGE,
 T_DKIM_INVALID autolearn=disabled version=3.3.2
Received: from lists.gnu.org ([2001:4830:134:3::11]:42029)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rrt@HIDDEN>)
 id 1XGV8e-00075l-NL
 for submit <at> debbugs.gnu.org; Sun, 10 Aug 2014 11:34:28 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51786)
 by lists.gnu.org with esmtp (Exim 4.71)
 (envelope-from <rrt@HIDDEN>) id 1XGV8d-0005HL-Bx
 for bug-gnu-emacs@HIDDEN; Sun, 10 Aug 2014 11:34:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <rrt@HIDDEN>) id 1XGV8c-00075N-BD
 for bug-gnu-emacs@HIDDEN; Sun, 10 Aug 2014 11:34:27 -0400
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55213)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rrt@HIDDEN>)
 id 1XGV8c-00075J-7q
 for bug-gnu-emacs@HIDDEN; Sun, 10 Aug 2014 11:34:26 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47708)
 by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <rrt@HIDDEN>) id 1XGV8b-0005Pz-T3
 for bug-emacs@HIDDEN; Sun, 10 Aug 2014 11:34:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <rrt@HIDDEN>) id 1XGV8a-000754-M6
 for bug-emacs@HIDDEN; Sun, 10 Aug 2014 11:34:25 -0400
Received: from mail-la0-x233.google.com ([2a00:1450:4010:c03::233]:40117)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rrt@HIDDEN>)
 id 1XGV8a-00074y-E7
 for bug-emacs@HIDDEN; Sun, 10 Aug 2014 11:34:24 -0400
Received: by mail-la0-f51.google.com with SMTP id pn19so5998784lab.10
 for <bug-emacs@HIDDEN>; Sun, 10 Aug 2014 08:34:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google;
 h=mime-version:date:message-id:subject:from:to:content-type;
 bh=t5bEWMujTI/J0pH0+0R5zZSn1jaxrudgG7fpMIV2FTE=;
 b=40SY8TIg4VLq38jUVLbsyubDJ9AhACgFT89lGuXocGrOlNAErgQGFNdF7B1sZcsZN5
 bVXpW6HviLt7/ZF2ANLwAg80vAGAfw1CKxulGPCwWzcIhzWTj+WZnldrDkfxVk2OxETS
 ElTAaUnew4bYrVupmRmqylY4lIvtwBrEWxOdo=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:mime-version:date:message-id:subject:from:to
 :content-type;
 bh=t5bEWMujTI/J0pH0+0R5zZSn1jaxrudgG7fpMIV2FTE=;
 b=W4HrGKqM+3qNz7JapWB4zrdfl0AjR/7X8/kz239wQxwi0XwPHV3gWq32yBQOOoKJVA
 aboAdyQdcW/Cu7jP/DfQ/NTjadBwBdMS7XChx5QZx47r+NLuIIiykcf8K+677aObjVfT
 /35Mlur5nSFFEBwCKswzJt2b7UiaC83RSe9cL26hImk6zoO2PehLp3myRmizoWSPdI35
 wrjgIrnwO4o5zxAGjUxXbKAAtQysBgp/HWQV5HF1Cjci0eGtPY3frRmG81jp/+YUiuMu
 4NY8OK/MX7sWFk/b1RCJQeEOqNhwSKjHxuzbPyjUpFZfWXO/dhjDiqFPl0BfrrECMuEv
 Hz9Q==
X-Gm-Message-State: ALoCoQnc2fuEqux4qfr6TlEcmmYa4HfG71WeZwvfBU74IOYIeJ1yCjLTQdwN1T7phqTRfWGHvHGK
MIME-Version: 1.0
X-Received: by 10.112.138.195 with SMTP id qs3mr31718894lbb.49.1407684863152; 
 Sun, 10 Aug 2014 08:34:23 -0700 (PDT)
Received: by 10.152.246.10 with HTTP; Sun, 10 Aug 2014 08:34:23 -0700 (PDT)
Date: Sun, 10 Aug 2014 16:34:23 +0100
Message-ID: <CAOnWdogJuLQNVC-+0N2Hh9fNf2kHhSfR87epKgbKFPftYemAvA@HIDDEN>
Subject: diff-apply-hunk interacts poorly with line endings
From: Reuben Thomas <rrt@HIDDEN>
To: bug-emacs <bug-emacs@HIDDEN>
Content-Type: multipart/alternative; boundary=089e011609d0396d860500482c1c
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
 (bad octet value).
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
 (bad octet value).
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
 (bad octet value).
X-Received-From: 2001:4830:134:3::11
X-Spam-Score: -4.1 (----)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <http://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <http://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <http://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.1 (----)

--089e011609d0396d860500482c1c
Content-Type: text/plain; charset=UTF-8

I'm using Emacs 24.3. Consider the following two files:

foo:
----cut here----
This is a small test file.
It has DOS line endings.
----cut here----

bar:
----cut here----
This is a small test file.
It too has DOS line endings.
----cut here----

Save them with DOS line endings, and

diff foo bar > foo.patch
cp foo bar

Visit foo.patch. When I do that, each line ends in ^M.

Now, in the patch buffer, M-x diff-apply-hunk. Note that the ^Ms have been
added to the lines. Writing the buffer and examination with "hd" reveals
that each line now ends \r\r\n.

It seems what's happened here is that diff-mode doesn't try to diagnose the
character encoding of the patch file.

-- 
http://rrt.sc3d.org

--089e011609d0396d860500482c1c
Content-Type: text/html; charset=UTF-8

<div dir="ltr"><div><div>I&#39;m using Emacs 24.3. Consider the following two files:<br><br></div>foo:<br></div>----cut here----<br clear="all"><div><div><div><div><div><div><div>This is a small test file.<br>It has DOS line endings.<br>
----cut here----<br clear="all"><br></div><div>bar:<br>----cut here----<br>This is a small test file.
<br>It too has DOS line endings.
<br>----cut here----<br></div><div><br></div><div>Save them with DOS line endings, and<br><br>diff foo bar &gt; foo.patch<br></div><div>cp foo bar<br></div><div><br></div><div>Visit foo.patch. When I do that, each line ends in ^M.<br>
<br></div><div>Now, in the patch buffer, M-x diff-apply-hunk. Note that the ^Ms have been added to the lines. Writing the buffer and examination with &quot;hd&quot; reveals that each line now ends \r\r\n.<br><br></div><div>
It seems what&#39;s happened here is that diff-mode doesn&#39;t try to diagnose the character encoding of the patch file.<br></div><div><br>-- <br><a href="http://rrt.sc3d.org">http://rrt.sc3d.org</a>
</div></div></div></div></div></div></div></div>

--089e011609d0396d860500482c1c--




Acknowledgement sent to Reuben Thomas <rrt@HIDDEN>:
New bug report received and forwarded. Copy sent to bug-gnu-emacs@HIDDEN. Full text available.
Report forwarded to bug-gnu-emacs@HIDDEN:
bug#18236; Package emacs. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Mon, 6 Jun 2016 03:15:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.