Merge from emacs-23

[bpt/emacs.git] / lisp / emacs-lisp / macroexp.el

diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 4bb925e..876b9a4 100644 (file)
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -1,6 +1,6 @@
 ;;; macroexp.el --- Additional macro-expansion support
 ;;
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: lisp, compiler, macros
@@ -134,7 +134,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
                (maybe-cons fun
                            (maybe-cons (macroexpand-all-forms (cadr form) 2)
                                        nil
-                                       (cadr form))
+                                       (cdr form))
                            form)
              form))
           ((memq fun '(let let*))
@@ -146,7 +146,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
           ((eq fun 'quote)
            form)
           ((and (consp fun) (eq (car fun) 'lambda))
-           ;; embedded lambda
+           ;; Embedded lambda in function position.
            (maybe-cons (macroexpand-all-forms fun 2)
                        (macroexpand-all-forms (cdr form))
                        form))