Defer evaluation of custom-set-faces!'s arguments

...until the theme has first loaded.

You'll need to set `doom-theme` to nil if you want to use this macro
without a theme!
This commit is contained in:
Henrik Lissner 2019-10-24 19:42:07 -04:00
parent a940d07e4b
commit ee80ed680c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 23 additions and 16 deletions

View file

@ -3,6 +3,9 @@
;;
;;; Variables
(defvar doom-init-theme-p nil
"If non-nil, a theme as been loaded.")
(defvar doom-theme nil
"A symbol representing the Emacs theme to load at startup.
@ -633,7 +636,8 @@ behavior). Do not set this directly, this is let-bound in `doom-init-theme-h'.")
"Set up `doom-load-theme-hook' to run after `load-theme' is called."
:after-while #'load-theme
(unless no-enable
(setq doom-theme theme)
(setq doom-theme theme
doom-init-theme-p t)
(run-hooks 'doom-load-theme-hook)))
(defadvice! doom--prefer-compiled-theme-a (orig-fn &rest args)