diff options
| author | Eli Zaretskii | 2016-01-16 15:40:58 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-01-16 15:40:58 +0200 |
| commit | 5409aca9afdba0f8554163b63526a6b831879700 (patch) | |
| tree | a6d0fc161948002c01f09f0a642cba386f0b5646 | |
| parent | e48f6dd3f79229d1dca96a691069eba45e90480c (diff) | |
| download | emacs-5409aca9afdba0f8554163b63526a6b831879700.tar.gz emacs-5409aca9afdba0f8554163b63526a6b831879700.zip | |
* doc/lispref/macros.texi (Expansion): Document 'macroexpand-1'.
| -rw-r--r-- | doc/lispref/macros.texi | 6 | ||||
| -rw-r--r-- | etc/NEWS | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi index 7f3b670e328..3f9db8ce375 100644 --- a/doc/lispref/macros.texi +++ b/doc/lispref/macros.texi | |||
| @@ -160,6 +160,12 @@ expand the embedded calls to @code{inc}: | |||
| 160 | 160 | ||
| 161 | @end defun | 161 | @end defun |
| 162 | 162 | ||
| 163 | @defun macroexpand-1 form &optional environment | ||
| 164 | This function expands macros like @code{macroexpand}, but it only | ||
| 165 | performs one step of the expansion: if the result is another macro | ||
| 166 | call, @code{macroexpand-1} will not expand it. | ||
| 167 | @end defun | ||
| 168 | |||
| 163 | @node Compiling Macros | 169 | @node Compiling Macros |
| 164 | @section Macros and Byte Compilation | 170 | @section Macros and Byte Compilation |
| 165 | @cindex byte-compiling macros | 171 | @cindex byte-compiling macros |
| @@ -1428,7 +1428,8 @@ evaluated (and should return a string) when the closure is built. | |||
| 1428 | +++ | 1428 | +++ |
| 1429 | ** define-inline provides a new way to define inlinable functions. | 1429 | ** define-inline provides a new way to define inlinable functions. |
| 1430 | 1430 | ||
| 1431 | ** New function `macroexpand-1' to perform a single step of macroexpansion. | 1431 | +++ |
| 1432 | ** New function `macroexpand-1' to perform a single step of macro expansion. | ||
| 1432 | 1433 | ||
| 1433 | ** Some "x-*" were obsoleted: | 1434 | ** Some "x-*" were obsoleted: |
| 1434 | *** x-select-text is renamed gui-select-text. | 1435 | *** x-select-text is renamed gui-select-text. |