summaryrefslogtreecommitdiff
path: root/test/lisp/use-package
diff options
context:
space:
mode:
authorJimmy Yuen Ho Wong <wyuenho@gmail.com>2020-07-22 02:05:31 +0100
committerGitHub <noreply@github.com>2020-07-22 02:05:31 +0100
commit1f54de9210a2add3a2e7f0416069bab5fe15d8e4 (patch)
tree095c8b9ae1d62d14f7cd94d715b014a4fccfdf4a /test/lisp/use-package
parent2ca2212f7312061c5462c8826774857e2455c1a8 (diff)
parentc358eedcf9f5c8921005bbaae78a3abc1fe8cc86 (diff)
downloademacs-1f54de9210a2add3a2e7f0416069bab5fe15d8e4.tar.gz
emacs-1f54de9210a2add3a2e7f0416069bab5fe15d8e4.tar.bz2
emacs-1f54de9210a2add3a2e7f0416069bab5fe15d8e4.zip
Merge branch 'master' into patch-1
Diffstat (limited to 'test/lisp/use-package')
-rw-r--r--test/lisp/use-package/use-package-tests.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index f0784315f75..42bf07453b4 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 ()