diff options
| author | John Wiegley <johnw@newartisans.com> | 2017-12-01 10:23:06 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2017-12-01 10:23:21 -0800 |
| commit | f5b034154f8fa2bab0375e34143de9d462ee1232 (patch) | |
| tree | a4deafdeb6cb8db837651f16e91633f682eba2a0 /lisp/use-package/use-package.el | |
| parent | 21b9b6551dae815a5ccee491735d7b9a0d27d2ad (diff) | |
| download | emacs-f5b034154f8fa2bab0375e34143de9d462ee1232.tar.gz emacs-f5b034154f8fa2bab0375e34143de9d462ee1232.tar.bz2 emacs-f5b034154f8fa2bab0375e34143de9d462ee1232.zip | |
Always wrap the expanded body from use-package in (progn)
Diffstat (limited to 'lisp/use-package/use-package.el')
| -rw-r--r-- | lisp/use-package/use-package.el | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 878fa673409..fe223305770 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -1760,25 +1760,25 @@ this file. Usage: (symbol-name name)) nil t))))))))) (let ((body - (macroexp-progn - (use-package-process-keywords name - (let ((args* - (use-package-sort-keywords - (if (and use-package-always-demand - (not (memq :defer args))) - (plist-put args :demand t) - args)))) - (when (and use-package-always-ensure - (plist-member args* :load-path) - (not (plist-member orig-args :ensure))) - (plist-put args* :ensure nil)) - (unless (plist-member args* :init) - (plist-put args* :init nil)) - (unless (plist-member args* :config) - (plist-put args* :config '(t))) - args*) - (and use-package-always-defer - (list :deferred t)))))) + `(progn + ,@(use-package-process-keywords name + (let ((args* + (use-package-sort-keywords + (if (and use-package-always-demand + (not (memq :defer args))) + (plist-put args :demand t) + args)))) + (when (and use-package-always-ensure + (plist-member args* :load-path) + (not (plist-member orig-args :ensure))) + (plist-put args* :ensure nil)) + (unless (plist-member args* :init) + (plist-put args* :init nil)) + (unless (plist-member args* :config) + (plist-put args* :config '(t))) + args*) + (and use-package-always-defer + (list :deferred t)))))) (when use-package-debug (display-buffer (save-current-buffer @@ -1787,6 +1787,7 @@ this file. Usage: (emacs-lisp-mode) (insert (pp-to-string body)) (current-buffer))))) + (message "body = %s" body) body)))) |