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

Using :load-path without also using :ensure now implies :ensure nil

Browse source 
Fixes https://github.com/jwiegley/use-package/issues/190
This commit is contained in:
John Wiegley 2017-11-29 22:10:01 -08:00
parent fab33fef3a
commit 5e1a656e06
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
etc/USE-PACKAGE-NEWS
View file

@ -27,6 +27,7 @@
- Support multiple symbols passed to `:after`, and a mini-DSL using `:all` and - Support multiple symbols passed to `:after`, and a mini-DSL using `:all` and
`:any`. `:any`.
- `:mode` and `:interpreter` can now accept `(rx ...)` forms. - `:mode` and `:interpreter` can now accept `(rx ...)` forms.
- Using `:load-path` without also using `:ensure` now implies `:ensure nil`.
- `:bind (:map foo-map ...)` now defers binding in the map until the package - `:bind (:map foo-map ...)` now defers binding in the map until the package
has been loaded. has been loaded.
- Print key bindings for keymaps in `describe-personal-keybindings`. - Print key bindings for keymaps in `describe-personal-keybindings`.

3
lisp/use-package/use-package.el
View file

@ -1764,6 +1764,9 @@ this file. Usage:
(not (memq :defer args))) (not (memq :defer args)))
(append args '(:demand t)) (append args '(:demand t))
args))) args)))
(when (and (plist-member args* :load-path)
(not (plist-member args* :ensure)))
(plist-put args* :ensure nil))
(unless (plist-member args* :init) (unless (plist-member args* :init)
(plist-put args* :init nil)) (plist-put args* :init nil))
(unless (plist-member args* :config) (unless (plist-member args* :config)