masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 11:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from andreyorst/face-spec-set

Browse source 
GitHub-reference: https://github.com/jwiegley/use-package/issues/1004
This commit is contained in:
John Wiegley 2022-10-27 13:21:13 -04:00 • committed by GitHub
commit 407b1bf4f0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/use-package/use-package-core.el
View file

@ -1518,7 +1518,7 @@ no keyword implies `:all'."
(defun use-package-handler/:custom-face (name _keyword args rest state) (defun use-package-handler/:custom-face (name _keyword args rest state)
"Generate use-package custom-face keyword code." "Generate use-package custom-face keyword code."
(use-package-concat (use-package-concat
(mapcar #'(lambda (def) `(custom-set-faces (backquote ,def))) args) (mapcar #'(lambda (def) `(apply #'face-spec-set (backquote ,def))) args)
(use-package-process-keywords name rest state))) (use-package-process-keywords name rest state)))
;;;; :init ;;;; :init

6
test/lisp/use-package/use-package-tests.el
View file

@ -1156,7 +1156,7 @@
(match-expansion (match-expansion
(use-package foo :custom-face (foo ((t (:background "#e4edfc"))))) (use-package foo :custom-face (foo ((t (:background "#e4edfc")))))
`(progn `(progn
(custom-set-faces (backquote (foo ((t (:background "#e4edfc")))))) (apply #'face-spec-set (backquote (foo ((t (:background "#e4edfc"))))))
(require 'foo nil nil)))) (require 'foo nil nil))))
(ert-deftest use-package-test/:custom-face-2 () (ert-deftest use-package-test/:custom-face-2 ()
@ -1166,9 +1166,9 @@
(example-1-face ((t (:foreground "LightPink")))) (example-1-face ((t (:foreground "LightPink"))))
(example-2-face ((t (:foreground "LightGreen"))))) (example-2-face ((t (:foreground "LightGreen")))))
`(progn `(progn
(custom-set-faces (apply #'face-spec-set
(backquote (example-1-face ((t (:foreground "LightPink")))))) (backquote (example-1-face ((t (:foreground "LightPink"))))))
(custom-set-faces (apply #'face-spec-set
(backquote (example-2-face ((t (:foreground "LightGreen")))))) (backquote (example-2-face ((t (:foreground "LightGreen"))))))
(require 'example nil nil)))) (require 'example nil nil))))