diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2005-12-26 03:16:59 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2005-12-26 03:16:59 +0000 |
commit | feba0cd6405ebb80af743e2f978442d9c837bcd2 (patch) | |
tree | 1cb964aa641bee514d9cda2eafe27a0a97e65ad1 /lisp/emacs-lisp | |
parent | 30663b475e57197c9896a252e1d4ca31c579fa2b (diff) | |
parent | 7a32e81fb608282314e27db21a00138aaa91f29a (diff) | |
download | emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.tar.gz emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.tar.bz2 emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.zip |
Merged from miles@gnu.org--gnu-2005 (patch 677)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-677
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-463
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/cl-extra.el | 5 |
1 files changed, 5 insertions, 0 deletions
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) |