Revert cfe2fe87; needs better checks

This commit is contained in:
Henrik Lissner 2018-03-15 04:49:49 -04:00
parent 627280c5da
commit 2a45b80e2a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -417,8 +417,6 @@ character that looks like a space that `whitespace-mode' won't affect.")
;; Theme & font
;;
(defvar doom-last-frame-type window-system)
(defun doom|init-theme ()
"Set the theme and load the font, in that order."
(when doom-theme
@ -461,9 +459,7 @@ character that looks like a space that `whitespace-mode' won't affect.")
;; frames, however. There's always `doom//reload-theme' if you need it!
(defun doom|init-theme-in-frame (frame)
"Reloads the theme in new daemon or tty frames."
(when (and (not (eq doom-last-frame-type window-system))
(or (daemonp) (not (display-graphic-p))))
(setq doom-last-frame-type window-system)
(when (or (daemonp) (not (display-graphic-p)))
(with-selected-frame frame
(doom|init-theme))))