Make custom-face evaluate elisp

Fix https://github.com/jwiegley/use-package/issues/696.

Copyright-paperwork-exempt: yes

diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index fec50fd4bb8d24e49d94cb4e6796f621ccfb97a7..7b4d26ba2a34d6aad89791841f13632a01bdc996 100644 (file)
--- 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 c4030b046080a1254390d09a5461430940e618c6..3e3e5a72a1320acd124cbaeb4c93a7122baa3925 100644 (file)
--- 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 ()