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: Mon, 14 Nov 2016 22:31:17 -0500 [thread overview]
Message-ID: <87twb9l8qi.fsf@users.sourceforge.net> (raw)
In-Reply-To: <87wpgge0kl.fsf@secretsauce.net> (Dima Kogan's message of "Sun, 06 Nov 2016 18:26:54 -0800")
Dima Kogan <dima@secretsauce.net> writes:
> npostavs@users.sourceforge.net writes:
>
>> Dima Kogan <dima@secretsauce.net> writes:
>>
>>> 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.
>
> Ack! So this is what happens when you submit a patch, and then talk
> about it more than 2 years later. Turns out preserving compatibility
> with existing code wasn't my goal at all. Rather, the goal was to avoid
> an infinite loop that results if (diff-hunk-next) unconditionally uses
> the new logic:
>
> diff-hunk-next calls
> diff--wrap-navigation calls
> diff-bounds-of-hunk calls
> diff-beginning-of-hunk calls
> diff-hunk-next
>
> Revised patch attached. I'll try to respond to any comments
> quickly so that we all can remember what this is about.
[...]
> - (t (error "No hunk found"))))))
> + ;; There's no next hunk, so just take the one we have
> + (t (list beg end))))))
Indentation on the comment looks a bit off.
> +
> + ;; I advance to the next hunk interactively because I want the
> + ;; interactive behavior of moving to the next logical hunk, not
> + ;; the legacy behavior where were would sometimes sty on the
> + ;; curent hunk. See http://debbugs.gnu.org/17544
> (when diff-advance-after-apply-hunk
> - (diff-hunk-next))))))
> + (diff-hunk-next nil t))))))
Updating the comment here will be useful for the next person trying to
figure out what this is all about in a couple more years.
> (hunk (delete-and-extract-region
> - (point) (save-excursion (diff-end-of-hunk) (point))))
> + (point) (cadr hunk-bounds)))
Indentation looks off here.
next prev parent reply other threads:[~2016-11-15 3:31 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
2016-11-07 2:26 ` Dima Kogan
2016-11-15 3:31 ` npostavs [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87twb9l8qi.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 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.