awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: swap load-theme advice for enable-theme-functions

Browse Source 
Instead of advising load-theme, which was more opinionated, and broke in
instances where users (relying on `custom-enabled-themes`s setter) or
packages (like auto-dark) were enabling themes with `enable-theme`
instead of `load-theme`.

This also adds support for enabling multiple themes with `doom-theme`.

Fix: #8119
This commit is contained in:
Henrik Lissner
2024-12-11 15:18:50 -05:00
parent ecd079f6da
commit 50b9afbb2d
2 changed files with 85 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lisp/lib/themes.el
View File

@ -45,7 +45,7 @@ all themes. It will apply to all themes once they are loaded."
;; 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)
(when (or (get 'doom-theme 'history)
(null doom-theme))
(doom--run-customize-theme-hook #',fn))
;; FIXME Prevent clobbering this on-the-fly
@ -63,23 +63,20 @@ doom-themes' API without worry."
;;;###autoload
(defun doom/reload-theme ()
"Reload the current Emacs theme."
"Reload all currently active themes."
(interactive)
(unless doom-theme
(user-error "No theme is active"))
(let ((themes (copy-sequence custom-enabled-themes)))
(mapc #'disable-theme custom-enabled-themes)
(let (doom-load-theme-hook)
(mapc #'enable-theme (reverse themes)))
(doom-run-hooks 'doom-load-theme-hook)
(let* ((themes (copy-sequence custom-enabled-themes))
(real-themes (cl-remove-if-not #'doom--theme-is-colorscheme-p themes)))
(mapc #'disable-theme themes)
(mapc #'enable-theme (reverse themes))
(doom/reload-font)
(message "%s %s"
(propertize
(format "Reloaded %d theme%s:"
(length themes)
(if (cdr themes) "s" ""))
(length real-themes)
(if (cdr real-themes) "s" ""))
'face 'bold)
(mapconcat #'prin1-to-string themes ", "))))
(mapconcat #'prin1-to-string real-themes ", "))))
;;