diff options
| author | Jimmy Yuen Ho Wong <wyuenho@gmail.com> | 2020-07-08 04:57:39 +0100 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2020-07-12 15:57:49 -0400 |
| commit | d3f847eaee1da6a87482b016bb916e0781082fd6 (patch) | |
| tree | 94a6c90e0d5931b790822fa84f21ebaeb2d3da44 | |
| parent | 3e96664ffe8f870118d730cc42b9c99f43134cbf (diff) | |
| download | emacs-d3f847eaee.tar.gz | |
Fix broken test due to
GitHub-reference: https://github.com/jwiegley/use-package/issues/850
| -rw-r--r-- | lisp/use-package/use-package-core.el | 2 | ||||
| -rw-r--r-- | test/lisp/use-package/use-package-tests.el | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index 169dbc455bc..94b8e451903 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -1563,7 +1563,7 @@ this file. Usage: :load-path Add to the `load-path' before attempting to load the package. :diminish Support for diminish.el (if installed). :delight Support for delight.el (if installed). -:custom Call `customize-set-variable' with each variable definition. +:custom Call `custom-set' or `set-default' with each variable definition. :custom-face Call `customize-set-faces' with each face definition. :ensure Loads the package using package.el if necessary. :pin Pin the package to an archive." diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el index 61438185373..1e89a5679ff 100644 --- a/test/lisp/use-package/use-package-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -1133,7 +1133,11 @@ (match-expansion (use-package foo :custom (foo bar)) `(progn - (customize-set-variable 'foo bar "Customized with use-package foo") + (funcall + (or + (get 'foo 'custom-set) + (function set-default)) + 'foo bar) (require 'foo nil nil)))) (ert-deftest use-package-test/:custom-face-1 () |