summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Zlatanov <tzz@lifelogs.com>2020-08-22 18:42:36 -0400
committerTed Zlatanov <tzz@lifelogs.com>2020-11-29 12:09:48 +0000
commit8ef7978028c3edaf47fb40a84fee576c4355753f (patch)
treedd8008011cc30fadaf0e0ae7fe669cac75cebff3
parent99643f8873e4181df7c1f61fa2bfb7d3b432b9db (diff)
downloademacs-8ef7978028.tar.gz
set saved-variable-comment from :custom
GitHub-reference: https://github.com/jwiegley/use-package/issues/861
-rw-r--r--lisp/use-package/use-package-core.el3
-rw-r--r--test/lisp/use-package/use-package-tests.el13
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index cd5b907a0b0..540c7349db0 100644
--- 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 42bf07453b4..38c2025cac6 100644
--- 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 ()