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

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

[elpa] externals/diff-hl d434060 2/2: Use vc-run-delayed for better stat


From: ELPA Syncer
Subject: [elpa] externals/diff-hl d434060 2/2: Use vc-run-delayed for better static checks
Date: Sat, 22 May 2021 20:57:08 -0400 (EDT)

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

    Use vc-run-delayed for better static checks
    
    Available since 24.4, looks like.
---
 diff-hl.el | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/diff-hl.el b/diff-hl.el
index 335627b..2c7943c 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -448,6 +448,7 @@ Only affects Git, it's the only backend that has staging 
area."
     (diff-hl-update)))
 
 (defun diff-hl-diff-goto-hunk-1 (historic)
+  (defvar vc-sentinel-movepoint)
   (vc-buffer-sync)
   (let* ((line (line-number-at-pos))
          (buffer (current-buffer))
@@ -458,10 +459,10 @@ Only affects Git, it's the only backend that has staging 
area."
         (setq rev1 (car revs)
               rev2 (cdr revs))))
     (vc-diff-internal t (vc-deduce-fileset) rev1 rev2 t)
-    (vc-exec-after `(if (< (line-number-at-pos (point-max)) 3)
-                        (with-current-buffer ,buffer (diff-hl-remove-overlays))
-                      (unless ,rev2
-                        (diff-hl-diff-skip-to ,line))
+    (vc-run-delayed (if (< (line-number-at-pos (point-max)) 3)
+                        (with-current-buffer buffer (diff-hl-remove-overlays))
+                      (unless rev2
+                        (diff-hl-diff-skip-to line))
                       (setq vc-sentinel-movepoint (point))))))
 
 (defun diff-hl-diff-goto-hunk (&optional historic)
@@ -547,14 +548,14 @@ in the source file, or the last line of the hunk above 
it."
           (progn
             (vc-diff-internal nil fileset diff-hl-reference-revision nil
                               nil diff-buffer)
-            (vc-exec-after
-             `(let (beg-line end-line m-end)
+            (vc-run-delayed
+              (let (beg-line end-line m-end)
                 (when (eobp)
-                  (with-current-buffer ,buffer (diff-hl-remove-overlays))
+                  (with-current-buffer buffer (diff-hl-remove-overlays))
                   (user-error "Buffer is up-to-date"))
                 (with-no-warnings
                   (let (diff-auto-refine-mode)
-                    (diff-hl-diff-skip-to ,line)))
+                    (diff-hl-diff-skip-to line)))
                 (save-excursion
                   (while (looking-at "[-+]") (forward-line 1))
                   (setq end-line (line-number-at-pos (point)))
@@ -576,12 +577,12 @@ in the source file, or the last line of the hunk above 
it."
                     (diff-refine-hunk)))
                 (if diff-hl-ask-before-revert-hunk
                     (unless (yes-or-no-p (format "Revert current hunk in %s? "
-                                                 ,(cl-caadr fileset)))
+                                                 (cl-caadr fileset)))
                       (user-error "Revert canceled")))
                 (let ((diff-advance-after-apply-hunk nil))
                   (save-window-excursion
                     (diff-apply-hunk t)))
-                (with-current-buffer ,buffer
+                (with-current-buffer buffer
                   (save-buffer))
                 (message "Hunk reverted"))))
         (quit-windows-on diff-buffer t)))))



reply via email to

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