diff options
| author | Eli Zaretskii | 2015-12-19 14:19:12 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-12-19 14:19:12 +0200 |
| commit | d59abe74ac7b643d118bcfba518f718f9c5b497c (patch) | |
| tree | cb7182792c34b14d0b27b503f4726ef916f9d32f /doc | |
| parent | 7de84646df80b559daec11e59acde3cf5ad5759e (diff) | |
| download | emacs-d59abe74ac7b643d118bcfba518f718f9c5b497c.tar.gz emacs-d59abe74ac7b643d118bcfba518f718f9c5b497c.zip | |
Manual followup to last change
* doc/lispref/display.texi (Displaying Messages): Sync with the
doc string. (Bug#22210)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/display.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index e9354cc2678..d1ac85a7cab 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -330,7 +330,7 @@ support them, then @code{message-box} uses the echo area, like | |||
| 330 | @code{message}. | 330 | @code{message}. |
| 331 | @end defun | 331 | @end defun |
| 332 | 332 | ||
| 333 | @defun display-message-or-buffer message &optional buffer-name not-this-window frame | 333 | @defun display-message-or-buffer message &optional buffer-name action frame |
| 334 | This function displays the message @var{message}, which may be either a | 334 | This function displays the message @var{message}, which may be either a |
| 335 | string or a buffer. If it is shorter than the maximum height of the | 335 | string or a buffer. If it is shorter than the maximum height of the |
| 336 | echo area, as defined by @code{max-mini-window-height}, it is displayed | 336 | echo area, as defined by @code{max-mini-window-height}, it is displayed |
| @@ -346,7 +346,7 @@ pop-up buffer is used, defaulting to @file{*Message*}. In the case | |||
| 346 | where @var{message} is a string and displayed in the echo area, it is | 346 | where @var{message} is a string and displayed in the echo area, it is |
| 347 | not specified whether the contents are inserted into the buffer anyway. | 347 | not specified whether the contents are inserted into the buffer anyway. |
| 348 | 348 | ||
| 349 | The optional arguments @var{not-this-window} and @var{frame} are as for | 349 | The optional arguments @var{action} and @var{frame} are as for |
| 350 | @code{display-buffer}, and only used if a buffer is displayed. | 350 | @code{display-buffer}, and only used if a buffer is displayed. |
| 351 | @end defun | 351 | @end defun |
| 352 | 352 | ||