unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Reuben Thomas <rrt@sc3d.org>
Cc: mbork@mbork.pl, 18236@debbugs.gnu.org
Subject: bug#18236: diff-apply-hunk interacts poorly with line endings
Date: Sat, 20 Feb 2016 14:50:47 +0200	[thread overview]
Message-ID: <83ziuvo89k.fsf@gnu.org> (raw)
In-Reply-To: <CAOnWdoimgyFqLPU5foSxV0NbYok8LcRyTCE4S_Xrd=vJwF56eg@mail.gmail.com> (message from Reuben Thomas on Sat, 20 Feb 2016 12:32:03 +0000)

> 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?

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.





  reply	other threads:[~2016-02-20 12:50 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 [this message]
2016-02-21 10:09               ` Marcin Borkowski
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=83ziuvo89k.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=18236@debbugs.gnu.org \
    --cc=mbork@mbork.pl \
    --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).