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

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

[nongnu] elpa/undo-fu-session 049fe942f6 11/53: Cleanup: order buffer-un


From: ELPA Syncer
Subject: [nongnu] elpa/undo-fu-session 049fe942f6 11/53: Cleanup: order buffer-undo-list before pending-undo-list
Date: Thu, 7 Jul 2022 12:05:16 -0400 (EDT)

branch: elpa/undo-fu-session
commit 049fe942f6ad3fe3a40e5898b26e2ff7838aa5a0
Author: Campbell Barton <ideasman42@gmail.com>
Commit: Campbell Barton <ideasman42@gmail.com>

    Cleanup: order buffer-undo-list before pending-undo-list
---
 undo-fu-session.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/undo-fu-session.el b/undo-fu-session.el
index 54dd5a989e..6105c5c090 100644
--- a/undo-fu-session.el
+++ b/undo-fu-session.el
@@ -381,8 +381,8 @@ Argument PENDING-LIST an `pending-undo-list'. compatible 
list."
 
       (let
         ( ;; Variables to build the 'content-data'.
-          (emacs-pending-undo-list nil)
           (emacs-buffer-undo-list nil)
+          (emacs-pending-undo-list nil)
           (emacs-undo-equiv-table nil))
 
         (cond
@@ -481,10 +481,11 @@ Argument PENDING-LIST an `pending-undo-list'. compatible 
list."
     (when content-data
       (let*
         (
-          (emacs-pending-undo-list
-            (undo-fu-session--decode (assoc-default 'emacs-pending-undo-list 
content-data #'eq t)))
           (emacs-buffer-undo-list
-            (undo-fu-session--decode (assoc-default 'emacs-buffer-undo-list 
content-data #'eq t)))
+            (undo-fu-session--decode (assoc-default 'emacs-buffer-undo-list 
content-data #'eq nil)))
+          (emacs-pending-undo-list
+            (undo-fu-session--decode
+              (assoc-default 'emacs-pending-undo-list content-data #'eq nil)))
           (emacs-undo-equiv-table
             (undo-fu-session--equivtable-decode
               (assoc-default 'emacs-undo-equiv-table content-data #'eq '())
@@ -492,8 +493,8 @@ Argument PENDING-LIST an `pending-undo-list'. compatible 
list."
               emacs-pending-undo-list)))
 
         ;; Assign undo data to the current buffer.
-        (setq pending-undo-list emacs-pending-undo-list)
         (setq buffer-undo-list emacs-buffer-undo-list)
+        (setq pending-undo-list emacs-pending-undo-list)
         ;; Merge the the hash-table since this is a global-variable, share 
between
         ;; buffers otherwise this interferes with other buffers undo-only/redo.
         (when (hash-table-p emacs-undo-equiv-table)



reply via email to

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