From: "Daniel Martín via Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Mark H Weaver <mhw@netris.org>
Cc: 43297@debbugs.gnu.org
Subject: bug#43297: 27.1; corrupts patch when diff-update-on-the-fly is set to nil
Date: Wed, 21 Dec 2022 11:28:54 +0100 [thread overview]
Message-ID: <m1y1r1yrrt.fsf@yahoo.es> (raw)
In-Reply-To: <87r1rag254.fsf@netris.org> (Mark H. Weaver's message of "Wed, 09 Sep 2020 15:50:36 -0400")
Mark H Weaver <mhw@netris.org> writes:
> I don't know if this behavior is new in 27.1, but that's the only
> version I've tried this on.
>
> When I set 'diff-update-on-the-fly' to nil, I find that some patches are
> consistently corrupted when I save them while in diff-mode. See below
> for an example patch that demonstrates this behavior.
>
> To reproduce:
>
> * Save the example patch below to "test.patch", and make another copy
> in "test2.patch".
>
> * Launch "emacs -nw -q" (I used Emacs 27.1)
>
> * Evaluate (setq diff-update-on-the-fly nil)
>
> * Find file "test2.patch".
>
> * Add a character anywhere in the buffer and then delete it, such that
> the buffer is now in a "modified" state.
>
> * Save the file.
>
> * Run "diff -u test.patch test2.patch" in the shell.
>
> * Here's the result that I see:
>
> --- test.patch
> +++ test2.patch
> @@ -39,7 +39,7 @@
>
> var elements = document.getElementsByTagName("style");
> for(var i = 0; i < elements.length; i++){
> -@@ -41,16 +48,20 @@ function reveal_css(){
> +@@ -41,17 +48,20 @@ function reveal_css(){
>
> }
> }
>
>
> Emacs corrupts the line count of the final hunk, making it one larger
> than it should be (17 instead of 16). This breaks the patch, such that
> attempts to apply it will fail.
I've tried to reproduce this bug in an Emacs build from the current
master branch and I couldn't. Could you try a recent build of Emacs and
confirm if it's also fixed for you? Thanks.
prev parent reply other threads:[~2022-12-21 10:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 19:50 bug#43297: 27.1; corrupts patch when diff-update-on-the-fly is set to nil Mark H Weaver
2020-10-16 6:49 ` Lars Ingebrigtsen
2020-10-16 7:01 ` Lars Ingebrigtsen
2020-10-16 8:29 ` Robert Pluim
2020-10-16 14:47 ` Lars Ingebrigtsen
2022-12-21 10:28 ` Daniel Martín via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m1y1r1yrrt.fsf@yahoo.es \
--to=bug-gnu-emacs@gnu.org \
--cc=43297@debbugs.gnu.org \
--cc=mardani29@yahoo.es \
--cc=mhw@netris.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.