diff options
| author | Daniel Colascione | 2018-06-16 14:21:54 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2018-06-16 14:21:54 -0700 |
| commit | 92b609c572c127b6c6616413549809ff20ee30c1 (patch) | |
| tree | 0bb14e3ec7e327f3770397e505afcd7c54d8b966 /src | |
| parent | 938d252d1c6c5e2027aa250c649deb024154f936 (diff) | |
| download | emacs-92b609c572c127b6c6616413549809ff20ee30c1.tar.gz emacs-92b609c572c127b6c6616413549809ff20ee30c1.zip | |
Restore old echo_truncate condition
* src/keyboard.c (read_key_sequence): Restore old
echo_truncate condition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 540991872a5..aa58e268435 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -8888,9 +8888,6 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt, | |||
| 8888 | /* Whether each event in the mocked input came from a mouse menu. */ | 8888 | /* Whether each event in the mocked input came from a mouse menu. */ |
| 8889 | bool used_mouse_menu_history[READ_KEY_ELTS] = {0}; | 8889 | bool used_mouse_menu_history[READ_KEY_ELTS] = {0}; |
| 8890 | 8890 | ||
| 8891 | /* Distinguish first time through from replay with mock_input == 0. */ | ||
| 8892 | bool is_replay = false; | ||
| 8893 | |||
| 8894 | /* If the sequence is unbound in submaps[], then | 8891 | /* If the sequence is unbound in submaps[], then |
| 8895 | keybuf[fkey.start..fkey.end-1] is a prefix in Vfunction_key_map, | 8892 | keybuf[fkey.start..fkey.end-1] is a prefix in Vfunction_key_map, |
| 8896 | and fkey.map is its binding. | 8893 | and fkey.map is its binding. |
| @@ -8999,9 +8996,8 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt, | |||
| 8999 | /* These are no-ops the first time through, but if we restart, they | 8996 | /* These are no-ops the first time through, but if we restart, they |
| 9000 | revert the echo area and this_command_keys to their original state. */ | 8997 | revert the echo area and this_command_keys to their original state. */ |
| 9001 | this_command_key_count = keys_start; | 8998 | this_command_key_count = keys_start; |
| 9002 | if (INTERACTIVE && is_replay) | 8999 | if (INTERACTIVE && t < mock_input) |
| 9003 | echo_truncate (echo_start); | 9000 | echo_truncate (echo_start); |
| 9004 | is_replay = true; | ||
| 9005 | 9001 | ||
| 9006 | /* If the best binding for the current key sequence is a keymap, or | 9002 | /* If the best binding for the current key sequence is a keymap, or |
| 9007 | we may be looking at a function key's escape sequence, keep on | 9003 | we may be looking at a function key's escape sequence, keep on |