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

Fix #5000: ensure 'doom always has precedence

Browse source 
'doom is a pseudo theme used to store internal faces and variables, and
must have the highest precedence (like the 'user theme, but without the
risk of being written to custom-file).
This commit is contained in:
Henrik Lissner 2021-05-09 01:19:57 -04:00
parent cab8f03a51
commit 8f3b798620
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/core-ui.el
View file

@ -567,7 +567,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
;; ;;
;;; Theme & font ;;; Theme & font
;; Use a psuedo theme to store internal and user faces + custom.el settings ;; Use a pseudo theme to store internal and user faces + custom.el settings
;; without risk of them being written to `custom-file'. ;; without risk of them being written to `custom-file'.
(custom-declare-theme 'doom nil) (custom-declare-theme 'doom nil)
@ -620,12 +620,15 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
(defun doom-init-theme-h (&optional frame) (defun doom-init-theme-h (&optional frame)
"Load the theme specified by `doom-theme' in FRAME." "Load the theme specified by `doom-theme' in FRAME."
(when (and doom-theme (not (custom-theme-enabled-p doom-theme))) (if doom-theme
;; Fix #1397: if `doom-init-theme-h' is used on `after-make-frame-functions' (unless (custom-theme-enabled-p doom-theme)
;; (for daemon sessions), the new frame must be focused to ensure the theme ;; Fix #1397: if `doom-init-theme-h' is used on `after-make-frame-functions'
;; loads correctly. ;; (for daemon sessions), the new frame must be focused to ensure the theme
(with-selected-frame (or frame (selected-frame)) ;; loads correctly.
(load-theme doom-theme t)))) (with-selected-frame (or frame (selected-frame))
(load-theme doom-theme t)))
;; Ensure custom faces apply and have highest precendence
(enable-theme 'doom)))
(defadvice! doom--load-theme-a (orig-fn theme &optional no-confirm no-enable) (defadvice! doom--load-theme-a (orig-fn theme &optional no-confirm no-enable)
"Record `doom-theme', disable old themes, and trigger `doom-load-theme-hook'." "Record `doom-theme', disable old themes, and trigger `doom-load-theme-hook'."
@ -642,7 +645,9 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
(when (and (not no-enable) (custom-theme-enabled-p theme)) (when (and (not no-enable) (custom-theme-enabled-p theme))
(setq doom-theme theme) (setq doom-theme theme)
(put 'doom-theme 'previous-themes last-themes) (put 'doom-theme 'previous-themes last-themes)
(doom-run-hooks 'doom-load-theme-hook)))))) (doom-run-hooks 'doom-load-theme-hook)
;; `doom' must have precedence
(enable-theme 'doom))))))
;; ;;