emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/diff-hl 47f8724 2/2: Restore diff-hl-revert-highlight-f


From: ELPA Syncer
Subject: [elpa] externals/diff-hl 47f8724 2/2: Restore diff-hl-revert-highlight-first-column's hunk recentering
Date: Mon, 1 Nov 2021 22:57:17 -0400 (EDT)

branch: externals/diff-hl
commit 47f8724ced083c4f5aca9e0751bfd2489198d1be
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    Restore diff-hl-revert-highlight-first-column's hunk recentering
---
 diff-hl.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/diff-hl.el b/diff-hl.el
index 021b830..d149621 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -558,7 +558,7 @@ in the source file, or the last line of the hunk above it."
             (vc-diff-internal nil fileset diff-hl-reference-revision nil
                               nil diff-buffer)
             (vc-run-delayed
-              (let (beg-line end-line m-end)
+              (let (beg-line end-line m-beg m-end)
                 (when (eobp)
                   (with-current-buffer buffer (diff-hl-remove-overlays))
                   (user-error "Buffer is up-to-date"))
@@ -566,9 +566,10 @@ in the source file, or the last line of the hunk above it."
                   (let (diff-auto-refine-mode)
                     (diff-hl-diff-skip-to line)))
                 (setq m-end (diff-hl-split-away-changes 3))
-                (setq beg-line (line-number-at-pos)
-                      end-line (line-number-at-pos m-end))
+                (setq m-beg (point-marker))
                 (funcall diff-hl-highlight-revert-hunk-function m-end)
+                (setq beg-line (line-number-at-pos m-beg)
+                      end-line (line-number-at-pos m-end))
                 (let ((wbh (window-body-height)))
                   (if (>= wbh (- end-line beg-line))
                       (recenter (/ (+ wbh (- beg-line end-line) 2) 2))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]