; Merge from origin/emacs-25

[gnu-emacs] / doc / lispref / macros.texi

diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index 7f3b670e328386d126e0c3189a0fb520a7a46191..6472bd1b03afd893ceb368ecec4df6476a29547b 100644 (file)
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -160,6 +160,12 @@ expand the embedded calls to @code{inc}:
 
 @end defun
 
+@defun macroexpand-1 form &optional environment
+This function expands macros like @code{macroexpand}, but it only
+performs one step of the expansion: if the result is another macro
+call, @code{macroexpand-1} will not expand it.
+@end defun
+
 @node Compiling Macros
 @section Macros and Byte Compilation
 @cindex byte-compiling macros
@@ -588,6 +594,11 @@ calls to the macro.  An indentation specification is written like this:
 (declare (indent @var{indent-spec}))
 @end example
 
+@noindent
+@cindex @code{lisp-indent-function} property
+This results in the @code{lisp-indent-function} property being set on
+the macro name.
+
 @noindent
 Here are the possibilities for @var{indent-spec}: