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 ce65cb5..876b9a4 100644 (file)
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -1,16 +1,16 @@
 ;;; macroexp.el --- Additional macro-expansion support
 ;;
-;; Copyright (C) 2004, 2005, 2006, 2007 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
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -136,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*))
@@ -148,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))
@@ -195,5 +193,5 @@ definitions to shadow the loaded ones for use in file byte-compilation."
 
 (provide 'macroexp)
 
-;;; arch-tag: af9b8c24-c196-43bc-91e1-a3570790fa5a
+;; arch-tag: af9b8c24-c196-43bc-91e1-a3570790fa5a
 ;;; macroexp.el ends here