diff options
| author | Eli Zaretskii | 2019-12-22 21:02:48 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2019-12-22 21:02:48 +0200 |
| commit | d7ab4edd93d44b33df72a4697b4628ee1133ca41 (patch) | |
| tree | dd88ab8aa5f107469b9d4765046aa903afb51a7e /src | |
| parent | 753389448de3b0da608f0631349aa84c2281ee1f (diff) | |
| download | emacs-d7ab4edd93d44b33df72a4697b4628ee1133ca41.tar.gz emacs-d7ab4edd93d44b33df72a4697b4628ee1133ca41.zip | |
Fix wording of recent documentation changes
* src/xdisp.c (syms_of_xdisp):
* lisp/minibuffer.el (minibuffer-message-clear-timeout):
* etc/NEWS:
* doc/lispref/display.texi (Displaying Messages): Minor
changes of wording of a recent commit. (Bug#38457)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 8cba5c5028d..2dfc4cbfeb4 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -34968,19 +34968,19 @@ display table takes effect; in this case, Emacs does not consult | |||
| 34968 | Vdebug_on_message = Qnil; | 34968 | Vdebug_on_message = Qnil; |
| 34969 | 34969 | ||
| 34970 | DEFVAR_LISP ("set-message-function", Vset_message_function, | 34970 | DEFVAR_LISP ("set-message-function", Vset_message_function, |
| 34971 | doc: /* If non-nil, function to show the message. | 34971 | doc: /* If non-nil, function to handle display of echo-area messages. |
| 34972 | The function is called with one argument that is the message. | 34972 | The function is called with one argument that is the text of a message. |
| 34973 | When this function returns nil, the message is displayed in the echo | 34973 | If this function returns nil, the message is displayed in the echo area |
| 34974 | area as usual. When the function returns a string, the returned | 34974 | as usual. If the function returns a string, the returned string is |
| 34975 | string is displayed in the echo area. When this function returns | 34975 | displayed in the echo area. If this function returns any other non-nil |
| 34976 | other non-nil values, this means that the message was handled | 34976 | value, this means that the message was already handled, and the original |
| 34977 | specially, so the same message is not displayed in the echo area. | 34977 | message text will not be displayed in the echo area. |
| 34978 | See also `clear-message-function' that can be used to clear the | 34978 | See also `clear-message-function' that can be used to clear the |
| 34979 | message displayed by this function. */); | 34979 | message displayed by this function. */); |
| 34980 | Vset_message_function = Qnil; | 34980 | Vset_message_function = Qnil; |
| 34981 | 34981 | ||
| 34982 | DEFVAR_LISP ("clear-message-function", Vclear_message_function, | 34982 | DEFVAR_LISP ("clear-message-function", Vclear_message_function, |
| 34983 | doc: /* If non-nil, function to clear message. | 34983 | doc: /* If non-nil, function to clear echo-area messages. |
| 34984 | Usually this function is called when the next input event arrives. | 34984 | Usually this function is called when the next input event arrives. |
| 34985 | The function is called without arguments. It is expected to clear the | 34985 | The function is called without arguments. It is expected to clear the |
| 34986 | message displayed by its counterpart function specified by | 34986 | message displayed by its counterpart function specified by |