(calendar-mode-map, calendar-mouse-3-map): Refer to

[bpt/emacs.git] / lispref / macros.texi

diff --git a/lispref/macros.texi b/lispref/macros.texi
index 9a0ef69..01805f6 100644 (file)
--- a/lispref/macros.texi
+++ b/lispref/macros.texi
@@ -1,6 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2004 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2002, 2003,
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/macros
 @node Macros, Customization, Functions, Top
@@ -140,13 +141,10 @@ uses this feature.
 
 @defun macroexpand-all form &optional environment
 @cindex macro expansion in entire form
-
 @code{macroexpand-all} expands macros like @code{macroexpand}, but
 will look for and expand all macros in @var{form}, not just at the
-top-level.
-
-In emacs-lisp, @code{macroexpand-all} guarantees that if no macros
-are expanded, the return value will be @code{eq} to @var{form}.
+top-level.  If no macros are expanded, the return value is @code{eq}
+to @var{form}.
 
 Repeating the example used for @code{macroexpand} above with
 @code{macroexpand-all}, we see that @code{macroexpand-all} @emph{does}
@@ -715,7 +713,7 @@ This is the same as no property---use the standard indentation pattern.
 @item @code{defun}
 Handle this function like a @samp{def} construct: treat the second
 line as the start of a @dfn{body}.
-@item a number, @var{number}
+@item an integer, @var{number}
 The first @var{number} arguments of the function are
 @dfn{distinguished} arguments; the rest are considered the body
 of the expression.  A line in the expression is indented according to