procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore old echo_truncate condition

Browse source 
* src/keyboard.c (read_key_sequence): Restore old
echo_truncate condition.
This commit is contained in:
Daniel Colascione 2018-06-16 14:21:54 -07:00
parent 938d252d1c
commit 92b609c572
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/keyboard.c
View file

@ -8888,9 +8888,6 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
/* Whether each event in the mocked input came from a mouse menu. */
bool used_mouse_menu_history[READ_KEY_ELTS] = {0};
/* Distinguish first time through from replay with mock_input == 0. */
bool is_replay = false;
/* If the sequence is unbound in submaps[], then
keybuf[fkey.start..fkey.end-1] is a prefix in Vfunction_key_map,
and fkey.map is its binding.
@ -8999,9 +8996,8 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
/* These are no-ops the first time through, but if we restart, they
revert the echo area and this_command_keys to their original state. */
this_command_key_count = keys_start;
if (INTERACTIVE && is_replay)
if (INTERACTIVE && t < mock_input)
echo_truncate (echo_start);
is_replay = true;
/* If the best binding for the current key sequence is a keymap, or
we may be looking at a function key's escape sequence, keep on