all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Mark Oteiza <mvoteiza@udel.edu>
To: Dima Kogan <dima@secretsauce.net>
Cc: 25105@debbugs.gnu.org, Dmitry Gutov <dgutov@yandex.ru>,
	Tino Calancha <tino.calancha@gmail.com>,
	npostavs@users.sourceforge.net
Subject: bug#25105: 26.0.50; diff navigation is broken
Date: Thu, 5 Jan 2017 22:06:06 -0500	[thread overview]
Message-ID: <20170106030606.GB1101@holos.localdomain> (raw)
In-Reply-To: <87shoxc70l.fsf@secretsauce.net>

On 05/01/17 at 05:27pm, Dima Kogan wrote:
> Dima Kogan <dima@secretsauce.net> writes:
> 
> > The behavior I want is to always have a consistent idea of which hunk we
> > are currently on.
> 
> Some more behaviors that I think are desirable are described in the
> commit message of the main patch:
> 
>   https://github.com/emacs-mirror/emacs/commit/2c8a7e50d24daf19e

The only mention of the changes to navigation is "Better navigation
logic".  Not documented in NEWS, and no tests for the corner cases.
I fail to see how fixing corner cases in diff-apply-hunk has anything to
do with diff-{file,hunk}-{next-prev}

At first glance, it looks like the following patch would restore the
previous behavior, however it completely breaks auto refinement.

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 9dfcd944bb..3442b01d12 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -625,7 +625,7 @@ diff--wrap-navigation
 ;; inner one does not, which breaks the loop.
 (defun diff-hunk-prev (&optional count skip-hunk-start)
   "Go to the previous COUNT'th hunk."
-  (interactive (list (prefix-numeric-value current-prefix-arg) t))
+  (interactive (list (prefix-numeric-value current-prefix-arg) nil))
   (diff--wrap-navigation
    skip-hunk-start
    "prev hunk"
@@ -636,7 +636,7 @@ diff-hunk-prev
 
 (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))
+  (interactive (list (prefix-numeric-value current-prefix-arg) nil))
   (diff--wrap-navigation
    skip-hunk-start
    "next hunk"
@@ -647,7 +647,7 @@ diff-hunk-next
 
 (defun diff-file-prev (&optional count skip-hunk-start)
   "Go to the previous COUNT'th file."
-  (interactive (list (prefix-numeric-value current-prefix-arg) t))
+  (interactive (list (prefix-numeric-value current-prefix-arg) nil))
   (diff--wrap-navigation
    skip-hunk-start
    "prev file"
@@ -658,7 +658,7 @@ diff-file-prev
 
 (defun diff-file-next (&optional count skip-hunk-start)
   "Go to the next COUNT'th file."
-  (interactive (list (prefix-numeric-value current-prefix-arg) t))
+  (interactive (list (prefix-numeric-value current-prefix-arg) nil))
   (diff--wrap-navigation
    skip-hunk-start
    "next file"





  reply	other threads:[~2017-01-06  3:06 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-04 15:13 bug#25105: 26.0.50; diff navigation is broken Mark Oteiza
2016-12-04 15:27 ` npostavs
2016-12-05 15:38   ` Dima Kogan
2016-12-05 15:53     ` Dmitry Gutov
2016-12-05 16:33       ` Dima Kogan
2016-12-05 16:55         ` Mark Oteiza
2016-12-05 17:49           ` Dima Kogan
2016-12-25  6:57             ` Dima Kogan
2016-12-25 13:54               ` Mark Oteiza
2017-01-06  1:14 ` Tino Calancha
2017-01-06  1:20   ` Dima Kogan
2017-01-06  1:27     ` Dima Kogan
2017-01-06  3:06       ` Mark Oteiza [this message]
2017-01-06  3:50         ` Tino Calancha
2017-01-06  4:16         ` Dima Kogan
2017-01-06  4:43           ` Mark Oteiza
2017-01-06  7:55           ` Eli Zaretskii
2017-01-06  8:03             ` Tino Calancha
2017-01-06 14:14               ` Dmitry Gutov
2017-01-07  1:54                 ` Tino Calancha
2017-01-07  2:05                   ` Mark Oteiza
2017-01-07  9:51                 ` Dima Kogan
2017-01-07 11:16                   ` Tino Calancha
2017-01-07 22:16                     ` Dima Kogan
2017-01-07 22:27                       ` Dmitry Gutov
2017-01-06  3:09     ` Mark Oteiza
2017-01-06  4:22     ` Tino Calancha

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=20170106030606.GB1101@holos.localdomain \
    --to=mvoteiza@udel.edu \
    --cc=25105@debbugs.gnu.org \
    --cc=dgutov@yandex.ru \
    --cc=dima@secretsauce.net \
    --cc=npostavs@users.sourceforge.net \
    --cc=tino.calancha@gmail.com \
    /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.