Re: [Emacs-diffs] master 92b609c: Restore old echo_truncate condition

Re: [Emacs-diffs] master 92b609c: Restore old echo_truncate condition

[Stefan Monnier]

>     Restore old echo_truncate condition

Is there some bug report, or message we could link t, or even better
a test we could add to avoid such a regression?
This code is fiendishly intricate in my experience, so such a revert
needs a comment explaining what we learned along the way.


        Stefan


>     * src/keyboard.c (read_key_sequence): Restore old
>     echo_truncate condition.
> ---
>  src/keyboard.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/src/keyboard.c b/src/keyboard.c
> index 5409918..aa58e26 100644
> --- a/src/keyboard.c
> +++ b/src/keyboard.c
> @@ -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
>
> _______________________________________________
> Emacs-diffs mailing list
> Emacs-diffs@gnu.org
> https://lists.gnu.org/mailman/listinfo/emacs-diffs