From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Daniel Colascione <dancol@dancol.org>
Cc: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] master 92b609c: Restore old echo_truncate condition
Date: Sun, 17 Jun 2018 14:45:32 -0400 [thread overview]
Message-ID: <jwvsh5lgsnu.fsf-monnier+emacsdiffs@gnu.org> (raw)
In-Reply-To: <20180616212218.9EA67204ED@vcs0.savannah.gnu.org> (Daniel Colascione's message of "Sat, 16 Jun 2018 17:22:18 -0400 (EDT)")
> 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
parent reply other threads:[~2018-06-17 18:45 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20180616212218.9EA67204ED@vcs0.savannah.gnu.org>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvsh5lgsnu.fsf-monnier+emacsdiffs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=dancol@dancol.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.