diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
| commit | c1b5000d8c484d7acd39414119838c78eaaf9cca (patch) | |
| tree | e179d9a26228aea7f586365f52eb9ec81bdcd856 /src/keyboard.c | |
| parent | fe3225830d0817d3d7eee1dfb92e0deec641c9c5 (diff) | |
| parent | d841a03c5ee3e9a59a133474601f9bda190ee8fa (diff) | |
| download | emacs-c1b5000d8c484d7acd39414119838c78eaaf9cca.tar.gz | |
Merge from origin/emacs-25
d841a03 ; Spelling fix
a6ae479 Post AppDefined events from the main thread ONLY (bug#23934)
d35d398 Update to the AUTHORS file for Bob Weiner
4d2f4df Revert "Fix local printer set to left aligned string formatter."
cd1b4d6 Revert "Fix ses-delete-blanks to delete only blanks + documen...
f7ceb8e Revert "Fix English."
baa7abd Improve doc strings of 'gud-gdb' and 'gdb'
aa4271a Fix doc string of 'minibuffer-message-timeout'
b275cc7 Fix English.
3c97b0f Fix ses-delete-blanks to delete only blanks + documentation.
272391f profiler: document prefix arg for tree expansion
442cc39 Clarify usage of eshell-visual-options
b443c3c Fix comment in files-in-below-directory
8a38e94 Fix local printer set to left aligned string formatter.
0f0b191 ; Fix typos in NEWS
6bdf687 ; * etc/NEWS: Remove temporary marks
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index ed4968486c3..f27ca0f86e0 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11689,7 +11689,8 @@ suppressed only after special commands that leave DEFVAR_LISP ("minibuffer-message-timeout", Vminibuffer_message_timeout, doc: /* How long to display an echo-area message when the minibuffer is active. -If the value is not a number, such messages don't time out. */); +If the value is a number, it should be specified in seconds. +If the value is not a number, such messages never time out. */); Vminibuffer_message_timeout = make_number (2); DEFVAR_LISP ("throw-on-input", Vthrow_on_input, |