From: npostavs@users.sourceforge.net
To: Dima Kogan <dima@secretsauce.net>
Cc: Andreas Schwab <schwab@linux-m68k.org>, 17544@debbugs.gnu.org
Subject: bug#17544: 24.3; [PATCH] Improved diff-mode navigation/manipulation
Date: Sat, 22 Oct 2016 22:49:21 -0400 [thread overview]
Message-ID: <87mvhvsrta.fsf@users.sourceforge.net> (raw)
In-Reply-To: <87h983rg9c.fsf@secretsauce.net> (Dima Kogan's message of "Sat, 22 Oct 2016 18:44:15 -0700")
Dima Kogan <dima@secretsauce.net> writes:
> npostavs@users.sourceforge.net writes:
>
>> Dima Kogan <dima@secretsauce.net> writes:
>>
>>> Here's yet another revised patch. The (call-interactively) at the end of
>>> (diff-apply-hunk) was important, it turns out. This would force it to
>>> use the new logic to move to the next hunk, instead of the legacy logic.
>>> I purposely left the behavior of (diff-next-hunk) unchanged from before
>>> when running non-interactively, and here I explicitly want the new
>>> behavior.
>>
>> If both behaviours are needed, it would be much better if lisp code
>> could choose between them without having to use call-interactively,
>> that's quite an awkward interface.
>
> Hi. I'm open to suggestions. The goal was to retain the previous logic
> for any existing code, but to provide improved user-facing behavior.
> Given this, it doesn't seem to me to be too awkward to pass-on the
> "interactive-p" state to child functions.
>
But you're synthesizing interactiveness in diff-apply-hunk, so it looks
like interactiveness is not what you actually care about. You could do
something like this instead:
(defun diff-hunk-next (&optional count skip-hunk-start)
"Go to the next COUNT'th hunk"
(interactive (list (prefix-numeric-value current-prefix-arg) t))
(diff--wrap-navigation
skip-hunk-start
"next hunk"
'diff--internal-hunk-next
diff-hunk-header-re
(lambda () (goto-char (car (diff-bounds-of-hunk))))
count))
Then instead of (call-interactively 'diff-hunk-next) you can just do
(diff-hunk-next nil t)
> Am I wrong to want to preserve
> existing behavior for elisp code? If so, then the entire old path can
> simply go away unconditionally.
Maybe. What about the other calls to diff-hunk-next? Was there a
reason you kept them the same?
next prev parent reply other threads:[~2016-10-23 2:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-21 12:21 bug#17544: 24.3; [PATCH] Improved diff-mode navigation/manipulation Dima Kogan
2016-02-24 2:33 ` Lars Ingebrigtsen
2016-09-03 9:17 ` Dima Kogan
2016-09-03 10:14 ` Eli Zaretskii
2016-09-03 21:24 ` Dima Kogan
2016-09-04 3:27 ` npostavs
2016-09-07 7:14 ` Dima Kogan
2016-09-14 22:31 ` Dima Kogan
2016-09-23 7:22 ` Dima Kogan
2016-10-22 15:47 ` npostavs
2016-10-23 1:44 ` Dima Kogan
2016-10-23 2:49 ` npostavs [this message]
2016-11-07 2:26 ` Dima Kogan
2016-11-15 3:31 ` npostavs
2016-11-17 4:15 ` Dima Kogan
2016-11-17 4:33 ` npostavs
2016-11-17 8:05 ` Dima Kogan
2016-11-20 2:37 ` npostavs
2016-11-21 7:23 ` Dima Kogan
2016-11-23 0:42 ` npostavs
2016-11-23 21:11 ` Dima Kogan
2016-11-29 4:10 ` npostavs
2016-09-13 3:56 ` Dima Kogan
2016-09-03 11:05 ` Andreas Schwab
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=87mvhvsrta.fsf@users.sourceforge.net \
--to=npostavs@users.sourceforge.net \
--cc=17544@debbugs.gnu.org \
--cc=dima@secretsauce.net \
--cc=schwab@linux-m68k.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).