From: Juri Linkov <juri@linkov.net>
To: Sean Whitton <spwhitton@spwhitton.name>
Cc: Eli Zaretskii <eliz@gnu.org>, 73407@debbugs.gnu.org, dgutov@yandex.ru
Subject: bug#73407: [PATCH v4] bug#73407: 31.0.50; Add diff-discard-hunk
Date: Tue, 24 Sep 2024 19:59:04 +0300 [thread overview]
Message-ID: <867cb1dm3r.fsf@mail.linkov.net> (raw)
In-Reply-To: <87r0992h1n.fsf_-_@zephyr.silentflame.com> (Sean Whitton's message of "Tue, 24 Sep 2024 16:43:48 +0100")
>>> - (message "%d hunks failed; no buffers changed" failures)))))
>>> + (message "%d hunks failed; no buffers changed" failures)
>>> + failures))))
>>
>> This comes from existing text, but still: what does the above say when
>> there's only 1 failure? does it say "1 hunks failed"? If so, can we
>> improve the handling of singular/plural here?
>
> I've installed a fix for that.
Another variant would be to use 'ngettext'.
>> I'm a little concerned about the binding.
>>
>> We have 'diff-hunk-kill' on M-k (and also 'k'), and this new addition is
>> actually more destructive. I'm expecting users will trip over the difference
>> and call one of them when they wanted to call the other.
>
> Yeah, and thinking about it more, it also doesn't really match what C-c
> C-k does elsewhere in Emacs. I've made it C-c M-r in the attached v4.
There is the existing 'C-c C-m' submap that could be used with e.g.
'C-c RET C-k'.
> + (diff-reverse-direction beg end)
> + (condition-case ret
> + (diff-apply-buffer beg end)
> + ;; Reversing the hunk is an implementation detail, so ensure the
> + ;; user never sees it.
> + (error (diff-reverse-direction beg end)
> + (signal (car ret) (cdr ret)))
> + (:success (if ret
> + (diff-reverse-direction beg end)
Instead of reversing the direction back and forth,
it would be simpler to add another optional argument
to 'diff-apply-buffer' to delegate it to the
REVERSE argument of 'diff-find-source-location'.
next prev parent reply other threads:[~2024-09-24 16:59 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
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 [this message]
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=867cb1dm3r.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=73407@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
--cc=eliz@gnu.org \
--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).