1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00

Add configuration variable `use-package-check-before-init'

Fixes https://github.com/jwiegley/use-package/issues/306
This commit is contained in:
John Wiegley 2016-02-25 17:24:59 -08:00
parent ce51ea2055
commit 6a90a9f16d

View File

@ -66,9 +66,15 @@ then the expanded macros do their job silently."
:type 'boolean
:group 'use-package)
(defcustom use-package-check-before-init nil
"If non-nil, check that package exists before executing its `:init' block.
The check is performed by looking for the module using `locate-library'."
:type 'boolean
:group 'use-package)
(defcustom use-package-always-defer nil
"If non-nil, assume `:defer t` unless `:demand t` is given."
:type 'sexp
:type 'boolean
:group 'use-package)
(defcustom use-package-always-ensure nil
@ -938,7 +944,13 @@ deferred until the prefix key sequence is pressed."
(let ((body (use-package-process-keywords name rest state)))
(use-package-concat
;; The user's initializations
(use-package-hook-injector (use-package-as-string name) :init arg)
(let ((init-body
(use-package-hook-injector (use-package-as-string name)
:init arg)))
(if use-package-check-before-init
`((if (locate-library ,(use-package-as-string name))
,(macroexp-progn init-body)))
init-body))
body)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;