From 1fea2f3b743da1db666be7ce34904b74319d3f83 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 29 Sep 2015 15:08:55 -0400 Subject: [PATCH] * lisp/emacs-lisp/lisp-mode.el (let-when-compile): Work like let* --- lisp/emacs-lisp/lisp-mode.el | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index fec9467bbb7..9ce0dfd49e8 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -238,17 +238,21 @@ (throw 'found t)))))) (defmacro let-when-compile (bindings &rest body) - "Like `let', but allow for compile time optimization. -Use BINDINGS as in regular `let', but in BODY each usage should + "Like `let*', but allow for compile time optimization. +Use BINDINGS as in regular `let*', but in BODY each usage should be wrapped in `eval-when-compile'. This will generate compile-time constants from BINDINGS." (declare (indent 1) (debug let)) - (cl-progv (mapcar #'car bindings) - (mapcar (lambda (x) (eval (cadr x))) bindings) - (macroexpand-all - (macroexp-progn - body) - macroexpand-all-environment))) + (letrec ((loop + (lambda (bindings) + (if (null bindings) + (macroexpand-all (macroexp-progn body) + macroexpand-all-environment) + (let ((binding (pop bindings))) + (cl-progv (list (car binding)) + (list (eval (nth 1 binding) t)) + (funcall loop bindings))))))) + (funcall loop bindings))) (let-when-compile ((lisp-fdefs '("defmacro" "defun")) -- 2.11.4.GIT