From: Stefan Monnier Date: Mon, 19 Dec 2005 02:17:38 +0000 (+0000) Subject: (cl-macroexpand-all): Fix code-walk for X-Git-Tag: emacs-pretest-22.0.90~5212 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61f03d6f8f37028c704c9129e82ecfd00bb42f4a;p=emacs.git (cl-macroexpand-all): Fix code-walk for lexical-let when encountering ((lambda (...) ...) ...). --- diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 4ac1a72b0d7..c5a006912df 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -743,6 +743,11 @@ This also does some trivial optimizations to make the form prettier." (let* ((args (cl-macroexpand-body (cdr form) env)) (p args)) (while (and p (symbolp (car p))) (setq p (cddr p))) (if p (cl-macroexpand-all (cons 'setf args)) (cons 'setq args)))) + ((consp (car form)) + (cl-macroexpand-all (list* 'funcall + (list 'function (car form)) + (cdr form)) + env)) (t (cons (car form) (cl-macroexpand-body (cdr form) env))))) (defun cl-macroexpand-body (body &optional env)