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

Fix custom-theme-set-faces!

Browse source 
The body was still quoted from when it was a macro.
This commit is contained in:
Henrik Lissner 2019-07-28 14:09:31 +02:00
parent efb4584797
commit 529f8d7e7a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/autoload/themes.el
View file

@ -3,8 +3,9 @@
(defun doom--custom-theme-set-face (spec) (defun doom--custom-theme-set-face (spec)
(cond ((listp (car spec)) (cond ((listp (car spec))
(cl-loop for face in (car spec) (cl-loop for face in (car spec)
collect `(,face ,(cdr spec)))) collect
((keywordp (car spec)) (doom--custom-theme-set-face `(,face ,(cdr spec)))))
((keywordp (cadr spec))
`((,(car spec) ((t ,(cdr spec)))))) `((,(car spec) ((t ,(cdr spec))))))
(`((,(car spec) ,(cdr spec)))))) (`((,(car spec) ,(cdr spec))))))
@ -22,18 +23,18 @@ all themes. It will apply to all themes once they are loaded.
'(org-tag :background \"#4499FF\") '(org-tag :background \"#4499FF\")
'(org-ellipsis :inherit org-tag) '(org-ellipsis :inherit org-tag)
'(which-key-docstring-face :inherit font-lock-comment-face))" '(which-key-docstring-face :inherit font-lock-comment-face))"
`(let* ((themes (doom-enlist (or theme 'user))) (let* ((themes (doom-enlist (or theme 'user)))
(fn (gensym (format "doom--customize-%s-h-" (mapconcat #'symbol-name themes "-"))))) (fn (gensym (format "doom--customize-%s-h-" (mapconcat #'symbol-name themes "-")))))
(fset fn (fset fn
(lambda () (lambda ()
(dolist (theme themes) (dolist (theme themes)
(when (or (eq theme 'user) (when (or (eq theme 'user)
(custom-theme-enabled-p theme)) (custom-theme-enabled-p theme))
(apply #'custom-theme-set-faces 'user (apply #'custom-theme-set-faces 'user
(mapcan #'doom--custom-theme-set-face (mapcan #'doom--custom-theme-set-face
specs)))))) specs))))))
(funcall fn) (funcall fn)
(add-hook 'doom-load-theme-hook fn))) (add-hook 'doom-load-theme-hook fn)))
;;;###autoload ;;;###autoload
(defun custom-set-faces! (&rest specs) (defun custom-set-faces! (&rest specs)