set saved-variable-comment from :custom

GitHub-reference: https://github.com/jwiegley/use-package/issues/861

diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index cd5b907a0b0bf6971acdbc5006a289ac98cf9821..540c7349db039c4727e8359abe8151b707faa0b5 100644 (file)
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1396,7 +1396,8 @@ no keyword implies `:all'."
             (setq comment (format "Customized with use-package %s" name)))
           `(funcall (or (get (quote ,variable) 'custom-set) #'set-default)
                     (quote ,variable)
-                    ,value)))
+                    ,value)
+          `(put (quote ,variable) 'saved-variable-comment ,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 42bf07453b40b1e3cbfd73be0d51569addd39d14..38c2025cac6439b3f7e22a02383d1dc0dc729540 100644 (file)
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -1138,6 +1138,19 @@
         (get 'foo 'custom-set)
         (function set-default))
        'foo bar)
+      (set 'foo 'saved-variable-comment "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")
       (require 'foo nil nil))))
 
 (ert-deftest use-package-test/:custom-face-1 ()