95eb2989dc
Evaluating custom-set-faces! calls would add setter functions to doom-load-theme-hook indefinitely, which could add up each time you M-x doom/reload. Now it adds them to a subhook, which is reset whenever Doom is reloaded.
60 lines
2.1 KiB
EmacsLisp
60 lines
2.1 KiB
EmacsLisp
;;; core/autoload/themes.el -*- lexical-binding: t; -*-
|
|
|
|
(defun doom--custom-theme-set-face (spec)
|
|
(cond ((listp (car spec))
|
|
(cl-loop for face in (car spec)
|
|
collect
|
|
(car (doom--custom-theme-set-face (cons face (cdr spec))))))
|
|
((keywordp (cadr spec))
|
|
`((,(car spec) ((t ,(cdr spec))))))
|
|
(`((,(car spec) ,(cdr spec))))))
|
|
|
|
;;;###autoload
|
|
(defconst doom-customize-theme-hook nil)
|
|
|
|
(add-hook! 'doom-load-theme-hook :append
|
|
(defun doom-apply-customized-faces-h ()
|
|
(run-hooks 'doom-customize-theme-hook)))
|
|
|
|
;;;###autoload
|
|
(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-")))
|
|
`(progn
|
|
(defun ,fn ()
|
|
(let (custom--inhibit-theme-enable)
|
|
(dolist (theme (doom-enlist (or ,theme 'user)))
|
|
(when (or (eq theme 'user)
|
|
(custom-theme-enabled-p theme))
|
|
(apply #'custom-theme-set-faces theme
|
|
(mapcan #'doom--custom-theme-set-face
|
|
(list ,@specs)))))))
|
|
(when (or doom-init-theme-p (null doom-theme))
|
|
(funcall #',fn))
|
|
(add-hook 'doom-customize-theme-hook #',fn 'append))))
|
|
|
|
;;;###autoload
|
|
(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))
|
|
`(custom-theme-set-faces! 'user ,@specs))
|
|
|
|
(defvar doom--prefer-theme-elc)
|
|
;;;###autoload
|
|
(defun doom/reload-theme ()
|
|
"Reload the current color theme."
|
|
(interactive)
|
|
(let ((theme (or (car-safe custom-enabled-themes) doom-theme)))
|
|
(when theme
|
|
(mapc #'disable-theme custom-enabled-themes))
|
|
(load-theme doom-theme 'noconfirm)
|
|
(doom/reload-font)))
|