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

Revert "Convert custom-{,theme-}set-faces! to functions"

Browse source 
This reverts commit cab8f03a51.

Urg, they did have to be macros, otherwise arguments are evaluated
immediately. Note to self, stop committing things after midnight.

Fixes #5015
Closes #5016
This commit is contained in:
Henrik Lissner 2021-05-09 12:25:19 -04:00
parent a4a64b9c6c
commit 10f9ec44a0
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
core/autoload/themes.el
View file

@ -18,41 +18,41 @@
(`((,(car spec) ,(cdr spec))))))
;;;###autoload
(defun custom-theme-set-faces! (theme &rest specs)
(defmacro custom-theme-set-faces! (theme &rest specs)
"Apply a list of face SPECS as user customizations for THEME.
THEME can be a single symbol or list thereof. If nil, apply these settings to
all themes. It will apply to all themes once they are loaded."
(declare (indent defun))
(let ((fn (gensym "doom--customize-themes-h-")))
(fset
fn (lambda ()
`(progn
(defun ,fn ()
(let (custom--inhibit-theme-enable)
(dolist (theme (doom-enlist (or ,theme 'doom)))
(when (or (memq theme '(user doom))
(custom-theme-enabled-p theme))
(apply #'custom-theme-set-faces theme
(mapcan #'doom--custom-theme-set-face
(list ,@specs))))))))
;; Apply the changes immediately if the user is using the default theme or
;; the theme has already loaded. This allows you to evaluate these macros on
;; the fly and customize your faces iteratively.
(list ,@specs)))))))
;; Apply the changes immediately if the user is using the default theme
;; or the theme has already loaded. This allows you to evaluate these
;; macros on the fly and customize your faces iteratively.
(when (or (get 'doom-theme 'previous-themes)
(null doom-theme))
(funcall fn))
;; TODO Append to `doom-load-theme-hook' with DEPTH instead when Emacs 26.x
;; support is dropped.
(add-hook 'doom-customize-theme-hook fn 'append)))
(funcall #',fn))
;; TODO Append to `doom-load-theme-hook' with DEPTH instead when Emacs
;; 26.x support is dropped.
(add-hook 'doom-customize-theme-hook #',fn 'append))))
;;;###autoload
(defun custom-set-faces! (&rest specs)
(defmacro custom-set-faces! (&rest specs)
"Apply a list of face SPECS as user customizations.
This is a convenience macro alternative to `custom-set-face' which allows for a
simplified face format, and takes care of load order issues, so you can use
doom-themes' API without worry."
(declare (indent defun))
(apply #'custom-theme-set-faces! 'doom specs))
`(custom-theme-set-faces! 'doom ,@specs))
;;;###autoload
(defun doom/reload-theme ()