Create new "use-package" themse and use it for :custom with custom-theme-set-variables

diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 933e94aa2bd0351e38bfb332c00e641b89c08ec8..c44c36f77fd56c88237cb4d56d651dcfd0482079 100644 (file)
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -43,6 +43,11 @@
 (require 'cl-lib)
 (require 'tabulated-list)
 
+;; Declare a synthetic theme for :custom variables.
+;; Necessary in order to avoid having those variables saved by custom.el.
+(deftheme use-package)
+(enable-theme 'use-package)
+
 (if (and (eq emacs-major-version 24) (eq emacs-minor-version 3))
     (defsubst hash-table-keys (hash-table)
       "Return a list of keys in HASH-TABLE."
@@ -1394,8 +1399,9 @@ no keyword implies `:all'."
               (comment (nth 2 def)))
           (unless (and comment (stringp comment))
             (setq comment (format "Customized with use-package %s" name)))
-          `(customize-set-variable (quote ,variable) ,value ,comment)
-          `(put ',variable 'theme-value '((use-package-synthetic-theme ignore-just-for-saving)))))
+          `(let ((custom--inhibit-theme-enable nil))
+             (custom-theme-set-variables 'use-package
+                                        '(,variable ,value nil () ,comment)))))
     args)
    (use-package-process-keywords name rest state)))
 

diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index 38c2025cac6439b3f7e22a02383d1dc0dc729540..a68491cfb7b66d09068ea623682e2ef0b68a67e0 100644 (file)
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -1129,28 +1129,25 @@
     ;;                '((foo bar baz))))
     ))
 
+
 (ert-deftest use-package-test/:custom-1 ()
   (match-expansion
    (use-package foo :custom (foo bar))
    `(progn
-      (funcall
-       (or
-        (get 'foo 'custom-set)
-        (function set-default))
-       'foo bar)
-      (set 'foo 'saved-variable-comment "Customized with use-package foo")
+      (let
+          ((custom--inhibit-theme-enable nil))
+        (custom-theme-set-variables 'use-package
+                                    '(foo bar nil nil "Customized with use-package foo")))
       (require 'foo nil nil))))
 
 (ert-deftest use-package-test/:custom-with-comment1 ()
   (match-expansion
    (use-package foo :custom (foo bar "commented"))
    `(progn
-      (funcall
-       (or
-        (get 'foo 'custom-set)
-        (function set-default))
-       'foo bar)
-      (set 'foo 'saved-variable-comment "commented")
+      (let
+          ((custom--inhibit-theme-enable nil))
+        (custom-theme-set-variables 'use-package
+                                    '(foo bar nil nil "commented")))
       (require 'foo nil nil))))
 
 (ert-deftest use-package-test/:custom-face-1 ()