Use face-spec-set instead of custom-set-faces

GitHub-reference: https://github.com/jwiegley/use-package/issues/934
Copyright-paperwork-exempt: yes

diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 31b8048643255b211c8fa6339f6dfb6f1d113d67..21b1a7ab40e34c864a59e65ed221601d71f4748d 100644 (file)
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1518,7 +1518,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 (backquote ,def))) args)
+   (mapcar #'(lambda (def) `(apply #'face-spec-set (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 1ccd3ad07863a578196deeca3264c4decb8a4afb..7d98ca99e4ac3f5812157f8f3e0963aaadc06dde 100644 (file)
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -1156,7 +1156,7 @@
   (match-expansion
    (use-package foo :custom-face (foo ((t (:background "#e4edfc")))))
    `(progn
-      (custom-set-faces (backquote (foo ((t (:background "#e4edfc"))))))
+      (apply #'face-spec-set (backquote (foo ((t (:background "#e4edfc"))))))
       (require 'foo nil nil))))
 
 (ert-deftest use-package-test/:custom-face-2 ()
@@ -1166,11 +1166,11 @@
      (example-1-face ((t (:foreground "LightPink"))))
      (example-2-face ((t (:foreground "LightGreen")))))
    `(progn
-     (custom-set-faces
-      (backquote (example-1-face ((t (:foreground "LightPink"))))))
-     (custom-set-faces
-      (backquote (example-2-face ((t (:foreground "LightGreen"))))))
-     (require 'example nil nil))))
+      (apply #'face-spec-set
+             (backquote (example-1-face ((t (:foreground "LightPink"))))))
+      (apply #'face-spec-set
+             (backquote (example-2-face ((t (:foreground "LightGreen"))))))
+      (require 'example nil nil))))
 
 (ert-deftest use-package-test/:init-1 ()
   (match-expansion