diff options
| author | John Wiegley <johnw@newartisans.com> | 2017-11-30 21:45:17 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2017-11-30 21:45:25 -0800 |
| commit | 1a09f8fef22d477c2a04fdf4bcda62f26d818a6f (patch) | |
| tree | 8298129345e329c87b859009b52b1eba51cabf68 /lisp/use-package/use-package.el | |
| parent | 0791e3fefe73e09b853014129db78b3b16949f3f (diff) | |
| download | emacs-1a09f8fef22d477c2a04fdf4bcda62f26d818a6f.tar.gz emacs-1a09f8fef22d477c2a04fdf4bcda62f26d818a6f.tar.bz2 emacs-1a09f8fef22d477c2a04fdf4bcda62f26d818a6f.zip | |
:no-require t should never require
Diffstat (limited to 'lisp/use-package/use-package.el')
| -rw-r--r-- | lisp/use-package/use-package.el | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 7a7b4660ca0..d55a4c0c437 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -933,7 +933,8 @@ If ALLOW-EMPTY is non-nil, it's OK for ARGS to be an empty list." (defun use-package-handler/:no-require (name keyword arg rest state) ;; This keyword has no functional meaning. - (use-package-process-keywords name rest state)) + (use-package-process-keywords name rest + (plist-put state :no-require t))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; @@ -1459,12 +1460,15 @@ representing symbols (that may need to be autloaded)." (format "Loading package %s" name) (if use-package-expand-minimally (use-package-concat - (list (use-package-load-name name)) + (unless (plist-get state ':no-require) + (list (use-package-load-name name))) config-body) - `((if (not ,(use-package-load-name name t)) - (ignore - (message (format "Cannot load %s" ',name))) - ,@config-body))))))) + (if (plist-get state ':no-require) + config-body + `((if (not ,(use-package-load-name name t)) + (ignore + (message (format "Cannot load %s" ',name))) + ,@config-body)))))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; |