From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Marcin Borkowski Newsgroups: gmane.emacs.bugs Subject: bug#18236: diff-apply-hunk interacts poorly with line endings Date: Sun, 21 Feb 2016 11:09:41 +0100 Message-ID: <87fuwmv0gq.fsf@mbork.pl> References: <87oabfz6xj.fsf@mbork.pl> <83twl7uw8l.fsf@gnu.org> <838u2jumb7.fsf@gnu.org> <834md3poft.fsf@gnu.org> <83ziuvo89k.fsf@gnu.org> 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 1456049425 30829 80.91.229.3 (21 Feb 2016 10:10:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 21 Feb 2016 10:10:25 +0000 (UTC) Cc: Reuben Thomas , 18236@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 21 11:10:11 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 1aXQxt-00039n-VO for geb-bug-gnu-emacs@m.gmane.org; Sun, 21 Feb 2016 11:10:10 +0100 Original-Received: from localhost ([::1]:39698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXQxt-0007vc-BV for geb-bug-gnu-emacs@m.gmane.org; Sun, 21 Feb 2016 05:10:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXQxq-0007uC-42 for bug-gnu-emacs@gnu.org; Sun, 21 Feb 2016 05:10:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXQxm-0006Iw-Uu for bug-gnu-emacs@gnu.org; Sun, 21 Feb 2016 05:10:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXQxm-0006Ik-RU for bug-gnu-emacs@gnu.org; Sun, 21 Feb 2016 05:10:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aXQxm-0005E9-Hf for bug-gnu-emacs@gnu.org; Sun, 21 Feb 2016 05:10:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Marcin Borkowski Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 21 Feb 2016 10:10:02 +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.145604939620078 (code B ref 18236); Sun, 21 Feb 2016 10:10:02 +0000 Original-Received: (at 18236) by debbugs.gnu.org; 21 Feb 2016 10:09:56 +0000 Original-Received: from localhost ([127.0.0.1]:35793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aXQxd-0005Dj-6h for submit@debbugs.gnu.org; Sun, 21 Feb 2016 05:09:56 -0500 Original-Received: from mail.mojserwer.eu ([195.110.48.8]:34800) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aXQxb-0005Db-OQ for 18236@debbugs.gnu.org; Sun, 21 Feb 2016 05:09:52 -0500 Original-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 Original-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) Original-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) User-agent: mu4e 0.9.13; emacs 25.1.50.2 In-reply-to: <83ziuvo89k.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:113396 Archived-At: On 2016-02-20, at 13:50, Eli Zaretskii wrote: >> Date: Sat, 20 Feb 2016 12:32:03 +0000 >> From: Reuben Thomas >> Cc: Marcin Borkowski , 18236@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