GNU bug report logs - #25105
26.0.50; diff navigation is broken

Previous Next

Full log

Message #55 received at 25105 <at> debbugs.gnu.org (full text, mbox):

From: Tino Calancha <tino.calancha <at> gmail.com>
To: Mark Oteiza <mvoteiza <at> udel.edu>
Cc: 25105 <at> debbugs.gnu.org, npostavs <at> users.sourceforge.net,
 Dmitry Gutov <dgutov <at> yandex.ru>, Dima Kogan <dima <at> secretsauce.net>,
 Tino Calancha <tino.calancha <at> gmail.com>
Subject: Re: bug#25105: 26.0.50; diff navigation is broken
Date: Fri, 6 Jan 2017 12:50:11 +0900 (JST)

On Thu, 5 Jan 2017, Mark Oteiza wrote:

> 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"
Hi Mark,

i have checked out your patch and your right: it recovered the Emacs-25
behaviour in your snippet code.
Tino

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.