masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 03:39:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move :init back to happening after all autoloads have occurred

Browse source 
Fixes https://github.com/jwiegley/use-package/issues/535
This commit is contained in:
John Wiegley 2017-12-04 09:03:13 -08:00
parent 5d9c854a6c
commit 0239ee227a
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
up-core.el
View file

@ -66,7 +66,6 @@
:after :after
:custom :custom
:custom-face :custom-face
:init
:bind :bind
:bind* :bind*
:bind-keymap :bind-keymap
@ -79,6 +78,7 @@
;; Any other keyword that also declares commands to be autoloaded (such as ;; Any other keyword that also declares commands to be autoloaded (such as
;; :bind) must appear before this keyword. ;; :bind) must appear before this keyword.
:commands :commands
:init
:defer :defer
:demand :demand
:load :load

9
up-tests.el
View file

@ -662,6 +662,15 @@
(eval-when-compile (eval-when-compile
(declare-function quux "foo")))))) (declare-function quux "foo"))))))
(ert-deftest use-package-test/:commands-4 ()
(match-expansion
(use-package foo :commands bar :init (bar))
`(progn
(unless
(fboundp 'bar)
(autoload #'bar "foo" nil t))
(bar))))
(ert-deftest use-package-test/:defines-1 () (ert-deftest use-package-test/:defines-1 ()
(match-expansion (match-expansion
(use-package foo :defines bar) (use-package foo :defines bar)