From c297dfdd20be463106376ff3da8677138d099718 Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Wed, 29 May 2019 16:04:35 +0800 Subject: [PATCH] Make custom-face evaluate elisp Fix https://github.com/jwiegley/use-package/issues/696. Copyright-paperwork-exempt: yes --- lisp/use-package/use-package-core.el | 2 +- test/lisp/use-package/use-package-tests.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index fec50fd4bb8..7b4d26ba2a3 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -1419,7 +1419,7 @@ no keyword implies `:all'." (defun use-package-handler/:custom-face (name _keyword args rest state) "Generate use-package custom-face keyword code." (use-package-concat - (mapcar #'(lambda (def) `(custom-set-faces (quote ,def))) args) + (mapcar #'(lambda (def) `(custom-set-faces (backquote ,def))) args) (use-package-process-keywords name rest state))) ;;;; :init diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el index c4030b04608..3e3e5a72a13 100644 --- a/test/lisp/use-package/use-package-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -1125,7 +1125,7 @@ (match-expansion (use-package foo :custom-face (foo ((t (:background "#e4edfc"))))) `(progn - (custom-set-faces '(foo ((t (:background "#e4edfc"))))) + (custom-set-faces (backquote (foo ((t (:background "#e4edfc")))))) (require 'foo nil nil)))) (ert-deftest use-package-test/:init-1 () -- 2.39.2