diff options
| author | Lars Ingebrigtsen | 2021-06-03 09:29:55 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2021-06-03 09:29:55 +0200 |
| commit | d08067d3620654fbe2352d42de8152ea20159cc4 (patch) | |
| tree | 7c8a0a85b26095ad7c4afa035c949d931c8616c2 | |
| parent | 6a152f898dfbc4cd7ece41adf4dc89422262c843 (diff) | |
| download | emacs-d08067d3620654fbe2352d42de8152ea20159cc4.tar.gz emacs-d08067d3620654fbe2352d42de8152ea20159cc4.zip | |
Cross-reference the message/error control variables
* src/keyboard.c (syms_of_keyboard): Mention set-message-function
in the command-error-function doc string...
* src/xdisp.c (syms_of_xdisp): ... and vice versa (bug#13752).
| -rw-r--r-- | src/keyboard.c | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index bddbb793a50..d2facc23644 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -12303,7 +12303,10 @@ Called with three arguments: | |||
| 12303 | - the error data, a list of the form (SIGNALED-CONDITION . SIGNAL-DATA) | 12303 | - the error data, a list of the form (SIGNALED-CONDITION . SIGNAL-DATA) |
| 12304 | such as what `condition-case' would bind its variable to, | 12304 | such as what `condition-case' would bind its variable to, |
| 12305 | - the context (a string which normally goes at the start of the message), | 12305 | - the context (a string which normally goes at the start of the message), |
| 12306 | - the Lisp function within which the error was signaled. */); | 12306 | - the Lisp function within which the error was signaled. |
| 12307 | |||
| 12308 | Also see `set-message-function' (which controls how non-error messages | ||
| 12309 | are displayed). */); | ||
| 12307 | Vcommand_error_function = intern ("command-error-default-function"); | 12310 | Vcommand_error_function = intern ("command-error-default-function"); |
| 12308 | 12311 | ||
| 12309 | DEFVAR_LISP ("enable-disabled-menus-and-buttons", | 12312 | DEFVAR_LISP ("enable-disabled-menus-and-buttons", |
diff --git a/src/xdisp.c b/src/xdisp.c index 0a95aa32f94..0e8672961ae 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -35639,8 +35639,10 @@ as usual. If the function returns a string, the returned string is | |||
| 35639 | displayed in the echo area. If this function returns any other non-nil | 35639 | displayed in the echo area. If this function returns any other non-nil |
| 35640 | value, this means that the message was already handled, and the original | 35640 | value, this means that the message was already handled, and the original |
| 35641 | message text will not be displayed in the echo area. | 35641 | message text will not be displayed in the echo area. |
| 35642 | See also `clear-message-function' that can be used to clear the | 35642 | |
| 35643 | message displayed by this function. */); | 35643 | Also see `clear-message-function' (which can be used to clear the |
| 35644 | message displayed by this function), and `command-error-function' | ||
| 35645 | (which controls how error messages are displayed). */); | ||
| 35644 | Vset_message_function = Qnil; | 35646 | Vset_message_function = Qnil; |
| 35645 | 35647 | ||
| 35646 | DEFVAR_LISP ("clear-message-function", Vclear_message_function, | 35648 | DEFVAR_LISP ("clear-message-function", Vclear_message_function, |