From: Juri Linkov <juri@linkov.net>
To: Sean Whitton <spwhitton@spwhitton.name>
Cc: 73407@debbugs.gnu.org, dgutov@yandex.ru
Subject: bug#73407: 31.0.50; Add diff-discard-hunk
Date: Tue, 24 Sep 2024 09:36:27 +0300 [thread overview]
Message-ID: <865xqleexg.fsf@mail.linkov.net> (raw)
In-Reply-To: <87jzf58g2t.fsf@zephyr.silentflame.com> (Sean Whitton's message of "Sat, 21 Sep 2024 11:19:06 +0100")
> These patches add a new command, diff-discard-hunk, inspired by some
> functionality from Magit. It nicely complements a workflow based around
> committing with C-x v v from C-x v D. I have been using it every day
> for a year or so, and I think others will find it useful, too.
>
> Posting for comments. Thanks!
It was hard to understand how it's related to C-x v v.
But then I realized it saves time to do what currently is done with:
'C-c C-r' (diff-reverse-direction)
'C-c C-a' (diff-apply-hunk)
'k' (diff-hunk-kill).
> +(defcustom diff-display-after-apply-hunk t
> + "Non-nil means `diff-apply-hunk' will display the buffer it just changed."
> + :type 'boolean)
> +
> @@ -2024,7 +2028,8 @@ diff-apply-hunk
> - (set-window-point (display-buffer buf) (+ (car pos) (cdr new)))
> + (when diff-display-after-apply-hunk
> + (set-window-point (display-buffer buf) (+ (car pos) (cdr new))))
Probably this change is not needed if 'diff-discard-hunk'
could avoid using 'diff-apply-hunk', and instead rely
on the algorithm from 'diff-apply-buffer'. Also optional
region arguments 'beg' and 'end' could be added to
'diff-apply-buffer'.
next prev parent reply other threads:[~2024-09-24 6:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-21 10:19 bug#73407: 31.0.50; Add diff-discard-hunk Sean Whitton
2024-09-23 22:52 ` Dmitry Gutov
2024-09-24 7:53 ` Sean Whitton
2024-09-24 12:27 ` Dmitry Gutov
2024-09-24 15:48 ` Sean Whitton
2024-09-24 6:36 ` Juri Linkov [this message]
2024-09-24 8:07 ` Sean Whitton
2024-09-24 8:40 ` Sean Whitton
2024-09-24 8:42 ` Sean Whitton
2024-09-24 12:22 ` Dmitry Gutov
2024-09-24 12:21 ` Eli Zaretskii
2024-09-24 12:23 ` Dmitry Gutov
2024-09-24 14:33 ` Óscar Fuentes
2024-09-24 15:43 ` bug#73407: [PATCH v4] " Sean Whitton
2024-09-24 16:59 ` Juri Linkov
2024-09-24 17:56 ` Sean Whitton
2024-09-24 18:07 ` Eli Zaretskii
2024-09-25 6:36 ` Sean Whitton
2024-09-25 12:17 ` Eli Zaretskii
2024-09-25 19:33 ` Sean Whitton
2024-09-24 12:20 ` Dmitry Gutov
2024-09-26 10:52 ` bug#73407: 31.0.50; Add diff-revert-and-kill-hunk Sean Whitton
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=865xqleexg.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=73407@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
--cc=spwhitton@spwhitton.name \
/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).