emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix over-aggressive theme reloading

Browse source 
`display-graphic-p` returns a boolean (possibly a recent change in Emacs
27), which will never match any window system, causing the theme to be
reloaded on every new frame.

Also default doom-last-window-system to initial-window-system.
This commit is contained in:
Henrik Lissner 2018-06-14 13:57:03 +02:00
parent cc3fd3126a
commit da6ce8e3f9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/core-ui.el
View file

@ -546,7 +546,8 @@ character that looks like a space that `whitespace-mode' won't affect.")
;; Theme & font ;; Theme & font
;; ;;
(defvar doom-last-window-system (if (daemonp) 'daemon window-system) (defvar doom-last-window-system
(if (daemonp) 'daemon initial-window-system)
"The `window-system' of the last frame. If this doesn't match the current "The `window-system' of the last frame. If this doesn't match the current
frame's window-system, the theme will be reloaded.") frame's window-system, the theme will be reloaded.")
@ -588,7 +589,7 @@ frame's window-system, the theme will be reloaded.")
(defun doom|init-theme-in-frame (frame) (defun doom|init-theme-in-frame (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 (display-graphic-p frame)))) (not (eq doom-last-window-system (framep-on-display frame))))
(with-selected-frame frame (with-selected-frame frame
(doom|init-theme)) (doom|init-theme))
(setq doom-last-window-system (display-graphic-p frame)))) (setq doom-last-window-system (display-graphic-p frame))))