diff options
| author | John Wiegley <johnw@newartisans.com> | 2017-12-07 04:53:10 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2017-12-07 04:53:10 +0000 |
| commit | 20694696b2795e7743ef0c4e257c9783c41217eb (patch) | |
| tree | 8f04d679ffb7bdcade0ee741015da114bff954d8 /lisp/use-package | |
| parent | 7cc17cee8f8ae2093d98efebf429cd10e9b0b81c (diff) | |
| download | emacs-20694696b2795e7743ef0c4e257c9783c41217eb.tar.gz emacs-20694696b2795e7743ef0c4e257c9783c41217eb.tar.bz2 emacs-20694696b2795e7743ef0c4e257c9783c41217eb.zip | |
Revert "Pre-expand lexical-let, since otherwise it requires cl to be loaded"
This reverts commit 7cc17cee8f8ae2093d98efebf429cd10e9b0b81c.
Diffstat (limited to 'lisp/use-package')
| -rw-r--r-- | lisp/use-package/use-package-core.el | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index d2910ed5686..517671b87f1 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -671,17 +671,14 @@ If ALLOW-EMPTY is non-nil, it's OK for ARGS to be an empty list." (defun use-package-memoize (f arg) "Ensure the macro-expansion of F applied to ARG evaluates ARG no more than once." - (let* ((loaded (cl-gensym "use-package--loaded")) - (result (cl-gensym "use-package--result")) - (next (cl-gensym "use-package--next")) - (body `(lexical-let (,loaded ,result) - ,@(funcall f `((if ,loaded - ,result - (setq ,loaded t) - (setq ,result ,arg))))))) - `(,(if (eq use-package-verbose 'errors) - body - (macroexpand body))))) + (let ((loaded (cl-gensym "use-package--loaded")) + (result (cl-gensym "use-package--result")) + (next (cl-gensym "use-package--next"))) + `((lexical-let (,loaded ,result) + ,@(funcall f `((if ,loaded + ,result + (setq ,loaded t) + (setq ,result ,arg)))))))) (defsubst use-package-normalize-value (label arg) "Normalize the Lisp value given by ARG. |