From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#18236: diff-apply-hunk interacts poorly with line endings Date: Wed, 17 Feb 2016 22:14:04 +0200 Message-ID: <838u2jumb7.fsf@gnu.org> References: <87oabfz6xj.fsf@mbork.pl> <83twl7uw8l.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1455740268 11681 80.91.229.3 (17 Feb 2016 20:17:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 17 Feb 2016 20:17:48 +0000 (UTC) Cc: mbork@mbork.pl, 18236@debbugs.gnu.org To: Reuben Thomas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Feb 17 21:17:36 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aW8XY-0007qs-9t for geb-bug-gnu-emacs@m.gmane.org; Wed, 17 Feb 2016 21:17:36 +0100 Original-Received: from localhost ([::1]:33111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW8XX-0006Vd-KW for geb-bug-gnu-emacs@m.gmane.org; Wed, 17 Feb 2016 15:17:35 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW8V7-00037a-AA for bug-gnu-emacs@gnu.org; Wed, 17 Feb 2016 15:15:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW8V3-0002fJ-Tt for bug-gnu-emacs@gnu.org; Wed, 17 Feb 2016 15:15:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW8V3-0002ev-Qr for bug-gnu-emacs@gnu.org; Wed, 17 Feb 2016 15:15:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aW8V3-0001u8-Ns for bug-gnu-emacs@gnu.org; Wed, 17 Feb 2016 15:15:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 17 Feb 2016 20:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18236 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 18236-submit@debbugs.gnu.org id=B18236.14557400427237 (code B ref 18236); Wed, 17 Feb 2016 20:15:01 +0000 Original-Received: (at 18236) by debbugs.gnu.org; 17 Feb 2016 20:14:02 +0000 Original-Received: from localhost ([127.0.0.1]:59991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aW8U5-0001sc-NF for submit@debbugs.gnu.org; Wed, 17 Feb 2016 15:14:02 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:37121) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aW8U3-0001s4-SC for 18236@debbugs.gnu.org; Wed, 17 Feb 2016 15:14:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW8Tv-0002Qe-H3 for 18236@debbugs.gnu.org; Wed, 17 Feb 2016 15:13:54 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59928) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW8Tv-0002QY-DW; Wed, 17 Feb 2016 15:13:51 -0500 Original-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 ) id 1aW8Tu-00075Q-NS; Wed, 17 Feb 2016 15:13:51 -0500 In-reply-to: (message from Reuben Thomas on Wed, 17 Feb 2016 19:59:02 +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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:113208 Archived-At: > Date: Wed, 17 Feb 2016 19:59:02 +0000 > From: Reuben Thomas > Cc: Marcin Borkowski , 18236@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.