From: Marcin Borkowski <mbork@mbork.pl>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Reuben Thomas <rrt@sc3d.org>, 18236@debbugs.gnu.org
Subject: bug#18236: diff-apply-hunk interacts poorly with line endings
Date: Sun, 21 Feb 2016 11:09:41 +0100 [thread overview]
Message-ID: <87fuwmv0gq.fsf@mbork.pl> (raw)
In-Reply-To: <83ziuvo89k.fsf@gnu.org>
On 2016-02-20, at 13:50, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Sat, 20 Feb 2016 12:32:03 +0000
>> From: Reuben Thomas <rrt@sc3d.org>
>> Cc: Marcin Borkowski <mbork@mbork.pl>, 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
next prev parent reply other threads:[~2016-02-21 10:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-10 15:34 bug#18236: diff-apply-hunk interacts poorly with line endings Reuben Thomas
2016-02-17 15:35 ` Marcin Borkowski
2016-02-17 16:39 ` Eli Zaretskii
2016-02-17 19:59 ` Reuben Thomas
2016-02-17 20:14 ` Eli Zaretskii
2016-02-20 12:16 ` Eli Zaretskii
2016-02-20 12:32 ` Reuben Thomas
2016-02-20 12:50 ` Eli Zaretskii
2016-02-21 10:09 ` Marcin Borkowski [this message]
2016-02-21 15:56 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fuwmv0gq.fsf@mbork.pl \
--to=mbork@mbork.pl \
--cc=18236@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=rrt@sc3d.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).