From de57793d6e2c3396a91fcb3556e58e832eee2937 Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Thu, 10 Mar 2022 16:38:51 -0500 Subject: Finally should have proper merge-list loading. --- perspective.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perspective.el b/perspective.el index 02a44f5..42ed288 100644 --- a/perspective.el +++ b/perspective.el @@ -1908,15 +1908,15 @@ restored." (cl-loop for frame in (persp--state-complete-frames state-complete) do (cl-incf frame-count) (when (> frame-count 1) - (let ((new-frame (make-frame-command)) - (frame-merge-list (persp--state-frame-v2-merge-list frame))) - (set-frame-parameter new-frame 'merge-list frame-merge-list))) + (make-frame-command)) (let* ((frame-persp-table (persp--state-frame-v2-persps frame)) - (frame-persp-order (reverse (persp--state-frame-v2-order frame)))) + (frame-persp-order (reverse (persp--state-frame-v2-order frame))) + (frame-persp-merge-list (persp--state-frame-v2-merge-list frame))) ;; iterate over the perspectives in the frame in the appropriate order (cl-loop for persp in frame-persp-order do (let ((state-single (gethash persp frame-persp-table))) (persp-switch persp) + (set-frame-parameter nil 'persp-merge-list frame-persp-merge-list) (cl-loop for buffer in (persp--state-single-buffers state-single) do (persp-add-buffer buffer)) ;; XXX: split-window-horizontally is necessary for -- cgit v1.0