aboutsummaryrefslogtreecommitdiff
path: root/perspective.el
diff options
context:
space:
mode:
authorNicholas Hubbard <nicholashubbard@posteo.net>2022-03-08 10:52:25 -0500
committerNicholas Hubbard <nicholashubbard@posteo.net>2022-03-08 10:52:25 -0500
commit81dfd5fd7b9c7d55ab9f69bc11cf9d3a9137ef18 (patch)
tree487f4c5ed2d94e52fd426020d501c03e024887e6 /perspective.el
parenteef4b6dbaeba5d9c78344370c1211ae99bd2a5b5 (diff)
Undo changes to state saving.
Diffstat (limited to 'perspective.el')
-rw-r--r--perspective.el9
1 files changed, 2 insertions, 7 deletions
diff --git a/perspective.el b/perspective.el
index db72b62..ae65db4 100644
--- a/perspective.el
+++ b/perspective.el
@@ -1675,13 +1675,11 @@ PERSP-SET-IDO-BUFFERS)."
;; :order [...]
;; }
;; ]
-;; :merge-list
;; }
(cl-defstruct persp--state-complete
files
- frames
- merge-list)
+ frames)
(cl-defstruct persp--state-frame
persps
@@ -1842,8 +1840,7 @@ visible in a perspective as windows, they will be saved as
(persp-save)
(let ((state-complete (make-persp--state-complete
:files (persp--state-file-data)
- :frames (persp--state-frame-data)
- :merge-list persp-merge-list)))
+ :frames (persp--state-frame-data))))
;; create or overwrite target-file:
(with-temp-file target-file (prin1 state-complete (current-buffer))))
;; after hook
@@ -1900,8 +1897,6 @@ restored."
(window-state-put (persp--state-single-windows state-single)
(frame-root-window (selected-frame))
'safe)))))
- ;; restore merge-list
- (setq persp-merge-list (persp--state-complete-merge-list state-complete))
;; cleanup
(persp-kill tmp-persp-name))
;; after hook