mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse source
This commit is contained in:
Jimmy Yuen Ho Wong 2020-07-22 02:05:31 +01:00 • committed by GitHub
commit 1f54de9210
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/use-package/use-package-core.el
View file

@ -1563,7 +1563,9 @@ this file. Usage:
:load-path Add to the `load-path' before attempting to load the package. :load-path Add to the `load-path' before attempting to load the package.
:diminish Support for diminish.el (if installed). :diminish Support for diminish.el (if installed).
:delight Support for delight.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 without modifying the Emacs `custom-file'.
(compare with `custom-set-variables').
:custom-face Call `customize-set-faces' with each face definition. :custom-face Call `customize-set-faces' with each face definition.
:ensure Loads the package using package.el if necessary. :ensure Loads the package using package.el if necessary.
:pin Pin the package to an archive." :pin Pin the package to an archive."

6
test/lisp/use-package/use-package-tests.el
View file

@ -1133,7 +1133,11 @@
(match-expansion (match-expansion
(use-package foo :custom (foo bar)) (use-package foo :custom (foo bar))
`(progn `(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)))) (require 'foo nil nil))))
(ert-deftest use-package-test/:custom-face-1 () (ert-deftest use-package-test/:custom-face-1 ()