aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Colascione2018-06-09 18:12:15 -0700
committerDaniel Colascione2018-06-09 18:14:03 -0700
commitcace203da108da4d281a99953a6fc71a18cde029 (patch)
tree6dd07dafbc063109c245acbba066d67bed90367c /src
parent3e3e23fb88fdc19e859c0aa2ab51b86afd323c71 (diff)
downloademacs-cace203da108da4d281a99953a6fc71a18cde029.tar.gz
emacs-cace203da108da4d281a99953a6fc71a18cde029.zip
Unbreak echoing
* src/keyboard.c (read_key_sequence): Don't echo_truncate the first time.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index bd9292c2652..c92684d3a3e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8964,6 +8964,9 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
8964 the first time we remember a mouse event. */ 8964 the first time we remember a mouse event. */
8965 Lisp_Object used_mouse_menu_history = Qnil; 8965 Lisp_Object used_mouse_menu_history = Qnil;
8966 8966
8967 /* Distinguish first time through from replay with mock_input == 0. */
8968 bool is_replay = false;
8969
8967 /* If the sequence is unbound in submaps[], then 8970 /* If the sequence is unbound in submaps[], then
8968 keybuf[fkey.start..fkey.end-1] is a prefix in Vfunction_key_map, 8971 keybuf[fkey.start..fkey.end-1] is a prefix in Vfunction_key_map,
8969 and fkey.map is its binding. 8972 and fkey.map is its binding.
@@ -9072,8 +9075,9 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
9072 /* These are no-ops the first time through, but if we restart, they 9075 /* These are no-ops the first time through, but if we restart, they
9073 revert the echo area and this_command_keys to their original state. */ 9076 revert the echo area and this_command_keys to their original state. */
9074 this_command_key_count = keys_start; 9077 this_command_key_count = keys_start;
9075 if (INTERACTIVE) 9078 if (INTERACTIVE && is_replay)
9076 echo_truncate (echo_start); 9079 echo_truncate (echo_start);
9080 is_replay = true;
9077 9081
9078 /* If the best binding for the current key sequence is a keymap, or 9082 /* If the best binding for the current key sequence is a keymap, or
9079 we may be looking at a function key's escape sequence, keep on 9083 we may be looking at a function key's escape sequence, keep on