[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#25105: 26.0.50; diff navigation is broken
From: |
Mark Oteiza |
Subject: |
bug#25105: 26.0.50; diff navigation is broken |
Date: |
Thu, 5 Jan 2017 22:06:06 -0500 |
User-agent: |
Mutt/1.7.2+12 (2bc2ec9ac664) (2016-11-26) |
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"
- bug#25105: 26.0.50; diff navigation is broken, Tino Calancha, 2017/01/05
- bug#25105: 26.0.50; diff navigation is broken, Dima Kogan, 2017/01/05
- bug#25105: 26.0.50; diff navigation is broken, Dima Kogan, 2017/01/05
- bug#25105: 26.0.50; diff navigation is broken,
Mark Oteiza <=
- bug#25105: 26.0.50; diff navigation is broken, Tino Calancha, 2017/01/05
- bug#25105: 26.0.50; diff navigation is broken, Dima Kogan, 2017/01/05
- bug#25105: 26.0.50; diff navigation is broken, Mark Oteiza, 2017/01/05
- bug#25105: 26.0.50; diff navigation is broken, Eli Zaretskii, 2017/01/06
- bug#25105: 26.0.50; diff navigation is broken, Tino Calancha, 2017/01/06
- bug#25105: 26.0.50; diff navigation is broken, Dmitry Gutov, 2017/01/06
- bug#25105: 26.0.50; diff navigation is broken, Tino Calancha, 2017/01/06
- bug#25105: 26.0.50; diff navigation is broken, Mark Oteiza, 2017/01/06
- bug#25105: 26.0.50; diff navigation is broken, Dima Kogan, 2017/01/07
- bug#25105: 26.0.50; diff navigation is broken, Tino Calancha, 2017/01/07