Fix broken frame creation/deletion (+ emacsclient)

Caused by a void-function error due to an incorrectly named function.
This commit is contained in:
Henrik Lissner 2018-07-30 13:53:36 +02:00
parent 78d14b0439
commit c2d5b64790
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -492,19 +492,17 @@ frame's window-system, the theme will be reloaded.")
;; ;;
;; There will still be issues with simultaneous gui and terminal (emacsclient) ;; There will still be issues with simultaneous gui and terminal (emacsclient)
;; frames, however. There's always `doom/reload-theme' if you need it! ;; frames, however. There's always `doom/reload-theme' if you need it!
(defun doom|reload-theme-in-frame (frame) (defun doom|reload-theme-in-frame-maybe (frame)
"Reloads the theme in new daemon or tty frames." "Reloads the theme in new daemon or tty frames."
(when (and (framep frame) (when (and (framep frame)
(not (eq doom-last-window-system (framep-on-display frame)))) (not (eq doom-last-window-system (framep-on-display frame))))
(with-selected-frame frame (with-selected-frame frame
(doom|init-theme)) (load-theme doom-theme t))
(setq doom-last-window-system (framep-on-display frame)))) (setq doom-last-window-system (framep-on-display frame))))
(defun doom|reload-theme-maybe (_frame) (defun doom|reload-theme-maybe (_frame)
"Reloads the theme after closing the last frame of a type." "Reloads the theme after closing the last frame of a type."
(unless (cl-loop for fr in (frame-list) (unless (cl-find doom-last-window-system (frame-list) :key #'framep-on-display)
if (eq doom-last-window-system (framep-on-display fr))
return t)
(setq doom-last-window-system nil) (setq doom-last-window-system nil)
(doom|reload-theme-in-frame (selected-frame)))) (doom|reload-theme-in-frame (selected-frame))))