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

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

[elpa] externals/vundo dff41a7527 3/4: Merge remote-tracking branch 'ide


From: ELPA Syncer
Subject: [elpa] externals/vundo dff41a7527 3/4: Merge remote-tracking branch 'ideasman42/pr-tabs-to-spaces'
Date: Thu, 21 Dec 2023 21:58:57 -0500 (EST)

branch: externals/vundo
commit dff41a75271adbd20cc85842f39d1789147a1389
Merge: 7fbe9d2fb1 750d8f0b5f
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>

    Merge remote-tracking branch 'ideasman42/pr-tabs-to-spaces'
---
 vundo-diff.el | 16 ++++++++--------
 vundo.el      |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/vundo-diff.el b/vundo-diff.el
index 239a19fb1b..75b7d84df0 100644
--- a/vundo-diff.el
+++ b/vundo-diff.el
@@ -126,18 +126,18 @@ Displays in a separate diff buffer with name based on
 the original buffer name."
   (interactive)
   (let* ((orig vundo--orig-buffer)
-        (oname (buffer-name orig))
-        (current (vundo--current-node vundo--prev-mod-list))
-        (marked (or vundo-diff--marked-node (vundo-m-parent current)))
-        swapped
-        mrkbuf)
+         (oname (buffer-name orig))
+         (current (vundo--current-node vundo--prev-mod-list))
+         (marked (or vundo-diff--marked-node (vundo-m-parent current)))
+         swapped
+         mrkbuf)
     (if (or (not current) (not marked) (eq current marked))
-       (message "vundo diff not available.")
+        (message "vundo diff not available.")
       (setq swapped (> (vundo-m-idx marked) (vundo-m-idx current)))
       (setq mrkbuf (get-buffer-create
-                   (make-temp-name (concat oname "-vundo-diff-marked"))))
+                    (make-temp-name (concat oname "-vundo-diff-marked"))))
       (unwind-protect
-         (progn
+          (progn
             (vundo--check-for-command
              (vundo--move-to-node current marked orig vundo--prev-mod-list)
              (with-current-buffer mrkbuf
diff --git a/vundo.el b/vundo.el
index 01642cadaf..72d3a2bc28 100644
--- a/vundo.el
+++ b/vundo.el
@@ -539,11 +539,11 @@ If FROM non-nil, build from FORM-th modification in 
MOD-LIST."
 In addition to undo-based timestamps, this includes the modtime of the
 current buffer (if unmodified)."
   (let* ((idx (vundo-m-idx node))
-        (current (vundo--current-node mod-list)))
+         (current (vundo--current-node mod-list)))
     (or (vundo--mod-timestamp mod-list idx)
-       (and (eq node current) (eq idx vundo--last-saved-idx)
+        (and (eq node current) (eq idx vundo--last-saved-idx)
              (with-current-buffer vundo--orig-buffer
-              (and (buffer-file-name)
+               (and (buffer-file-name)
                     (not (buffer-modified-p))
                     (visited-file-modtime)))))))
 ;;; Draw tree



reply via email to

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