From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Reuben Thomas Newsgroups: gmane.emacs.bugs Subject: bug#18236: diff-apply-hunk interacts poorly with line endings Date: Sat, 20 Feb 2016 12:32:03 +0000 Message-ID: References: <87oabfz6xj.fsf@mbork.pl> <83twl7uw8l.fsf@gnu.org> <838u2jumb7.fsf@gnu.org> <834md3poft.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=047d7bdc15ea76c985052c32c990 X-Trace: ger.gmane.org 1455971601 16909 80.91.229.3 (20 Feb 2016 12:33:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 20 Feb 2016 12:33:21 +0000 (UTC) Cc: Marcin Borkowski , 18236@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Feb 20 13:33:12 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 1aX6ik-00023P-2K for geb-bug-gnu-emacs@m.gmane.org; Sat, 20 Feb 2016 13:33:10 +0100 Original-Received: from localhost ([::1]:60521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aX6ij-0002FS-AL for geb-bug-gnu-emacs@m.gmane.org; Sat, 20 Feb 2016 07:33:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aX6if-0002FA-EI for bug-gnu-emacs@gnu.org; Sat, 20 Feb 2016 07:33:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aX6ic-0005yG-5p for bug-gnu-emacs@gnu.org; Sat, 20 Feb 2016 07:33:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:37540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aX6ic-0005yA-32 for bug-gnu-emacs@gnu.org; Sat, 20 Feb 2016 07:33:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aX6ib-0004V6-V1 for bug-gnu-emacs@gnu.org; Sat, 20 Feb 2016 07:33:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Reuben Thomas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 20 Feb 2016 12:33: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.145597153117243 (code B ref 18236); Sat, 20 Feb 2016 12:33:01 +0000 Original-Received: (at 18236) by debbugs.gnu.org; 20 Feb 2016 12:32:11 +0000 Original-Received: from localhost ([127.0.0.1]:34667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aX6hm-0004U2-O4 for submit@debbugs.gnu.org; Sat, 20 Feb 2016 07:32:10 -0500 Original-Received: from mail-ig0-f177.google.com ([209.85.213.177]:38882) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aX6hl-0004RM-22 for 18236@debbugs.gnu.org; Sat, 20 Feb 2016 07:32:09 -0500 Original-Received: by mail-ig0-f177.google.com with SMTP id y8so53084391igp.1 for <18236@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 X-Received: by 10.50.61.132 with SMTP id p4mr1971338igr.55.1455971523537; Sat, 20 Feb 2016 04:32:03 -0800 (PST) Original-Received: by 10.36.199.5 with HTTP; Sat, 20 Feb 2016 04:32:03 -0800 (PST) In-Reply-To: <834md3poft.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:113359 Archived-At: --047d7bdc15ea76c985052c32c990 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 20 February 2016 at 12:16, Eli Zaretskii 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
On = 20 February 2016 at 12:16, Eli Zaretskii <eliz@gnu.org> 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.=C2=A0 Will that be<= br> 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.

--
http://rrt.sc3d.= org
--047d7bdc15ea76c985052c32c990--