From 6b344a919754d53070280e691924011ad9086c76 Mon Sep 17 00:00:00 2001 From: Andrey Listopadov Date: Sat, 15 Oct 2022 19:03:03 +0300 Subject: [PATCH] Use face-spec-set instead of custom-set-faces GitHub-reference: https://github.com/jwiegley/use-package/issues/934 Copyright-paperwork-exempt: yes --- lisp/use-package/use-package-core.el | 2 +- test/lisp/use-package/use-package-tests.el | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index 31b80486432..21b1a7ab40e 100644 --- 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 1ccd3ad0786..7d98ca99e4a 100644 --- 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 -- 2.39.2