From 20694696b2795e7743ef0c4e257c9783c41217eb Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 7 Dec 2017 04:53:10 +0000 Subject: [PATCH] Revert "Pre-expand lexical-let, since otherwise it requires cl to be loaded" This reverts commit 7cc17cee8f8ae2093d98efebf429cd10e9b0b81c. --- lisp/use-package/use-package-core.el | 19 ++++++++----------- test/lisp/use-package/use-package-tests.el | 15 ++++++++++----- 2 files changed, 18 insertions(+), 16 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. diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el index 9dcab5fe63b..283758f5160 100644 --- a/test/lisp/use-package/use-package-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -1213,7 +1213,8 @@ (eval-after-load 'quux '(if ,_ ,_ (setq ,_ t) - (setq ,_ (require 'foo nil nil))))))))) + (setq ,_ (require 'foo nil nil))))))) + )) (ert-deftest use-package-test/:after-7 () (match-expansion @@ -1227,7 +1228,8 @@ (eval-after-load 'bow '(if ,_ ,_ (setq ,_ t) - (setq ,_ (require 'foo nil nil))))))) + (setq ,_ (require 'foo nil nil))))) + )) (ert-deftest use-package-test/:after-8 () (match-expansion @@ -1252,7 +1254,8 @@ (eval-after-load 'quux '(if ,_ ,_ (setq ,_ t) - (setq ,_ (require 'foo nil nil))))))))) + (setq ,_ (require 'foo nil nil))))))) + )) (ert-deftest use-package-test/:after-9 () (match-expansion @@ -1267,7 +1270,8 @@ '(eval-after-load 'bow '(if ,_ ,_ (setq ,_ t) - (setq ,_ (require 'foo nil nil)))))))) + (setq ,_ (require 'foo nil nil)))))) + )) (ert-deftest use-package-test/:after-10 () (match-expansion @@ -1285,7 +1289,8 @@ (eval-after-load 'baz '(if ,_ ,_ (setq ,_ t) - (setq ,_ (require 'foo nil nil))))))) + (setq ,_ (require 'foo nil nil))))) + )) (ert-deftest use-package-test/:demand-1 () (match-expansion -- 2.39.2