Skip to content

Fix uninitialized frame crashes #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zenspider merged 3 commits into from
Nov 20, 2019
Merged

Fix uninitialized frame crashes #104

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dee778
Fix errors resulting from uninitialized frames.
gcv May 25, 2019
43e0d58
Fix two more spots which assume 'persp--hash exists on all frames.
gcv Jul 9, 2019
abf4052
Allow persp-last to return nil again. Write clarifying comments.
gcv Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions perspective.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,16 +212,25 @@ all but one of their points will be overwritten.

LOCAL-VARIABLES is an alist from variable names to their
perspective-local values."
(frame-parameter frame 'persp--hash))
;; XXX: This must return a non-nil value to avoid breaking frames initialized
;; with after-make-frame-functions bound to nil.
(or (frame-parameter frame 'persp--hash)
(make-hash-table)))

(defun persp-curr (&optional frame)
"Get the current perspective in FRAME.
FRAME defaults to the currently selected frame."
(frame-parameter frame 'persp--curr))
;; XXX: This must return a non-nil value to avoid breaking frames initialized
;; with after-make-frame-functions bound to nil.
(or (frame-parameter frame 'persp--curr)
(make-persp-internal)))

(defun persp-last (&optional frame)
"Get the last active perspective in FRAME.
FRAME defaults to the currently selected frame."
;; XXX: Unlike persp-curr, it is unsafe to return a default value of
;; (make-persp-internal) here, since some code assumes (persp-last) can return
;; nil.
(frame-parameter frame 'persp--last))

(defun persp-mode-set-prefix-key (newkey)
Expand Down Expand Up @@ -608,7 +617,7 @@ perspective that has the buffer.

Prefers perspectives in the selected frame."
(cl-loop for frame in (sort (frame-list) (lambda (frame1 frame2) (eq frame2 (selected-frame))))
do (cl-loop for persp being the hash-values of (frame-parameter frame 'persp--hash)
do (cl-loop for persp being the hash-values of (perspectives-hash frame)
if (and (not (and (equal frame (selected-frame))
(equal (persp-name persp) (persp-name (persp-curr frame)))))
(memq buffer (persp-buffers persp)))
Expand Down Expand Up @@ -914,7 +923,7 @@ from the current perspective at time of creation."
(unless (assq variable (persp-local-variables (persp-curr)))
(let ((entry (list variable (symbol-value variable))))
(dolist (frame (frame-list))
(cl-loop for persp being the hash-values of (frame-parameter frame 'persp--hash)
(cl-loop for persp being the hash-values of (perspectives-hash frame)
do (push entry (persp-local-variables persp)))))))

(defmacro persp-setup-for (name &rest body)
Expand Down