diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2022-01-27 16:18:36 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-01-27 16:20:38 +0100 |
| commit | decd6f830c9b65da654f93d9c99c6a5b99c05977 (patch) | |
| tree | 5fc33e29dfcd86e31e4b63fdfd949de3e603c61f /src | |
| parent | 0991e8686cd90a7678346b7608c438fcb7e06bc6 (diff) | |
| download | emacs-decd6f830c9b65da654f93d9c99c6a5b99c05977.tar.gz emacs-decd6f830c9b65da654f93d9c99c6a5b99c05977.tar.bz2 emacs-decd6f830c9b65da654f93d9c99c6a5b99c05977.zip | |
Revert "Don't output spurious prefixes in read-char-exclusive"
This reverts commit 701ec0bda2b15fc97af6ca68fb842fb1ec9aac35.
This change broke display of `C-q-' when doing the `C-q' command,
so it has to be fixed a different way.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 13 | ||||
| -rw-r--r-- | src/lread.c | 9 |
2 files changed, 8 insertions, 14 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 9242e8dc624..441c23e10c7 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3059,13 +3059,12 @@ read_char (int commandflag, Lisp_Object map, /* Now wipe the echo area, except for help events which do their own stuff with the echo area. */ - if (!NILP (Vecho_keystrokes) - && (!CONSP (c) - || (!(EQ (Qhelp_echo, XCAR (c))) - && !(EQ (Qswitch_frame, XCAR (c))) - /* Don't wipe echo area for select window events: These might - get delayed via `mouse-autoselect-window' (Bug#11304). */ - && !(EQ (Qselect_window, XCAR (c)))))) + if (!CONSP (c) + || (!(EQ (Qhelp_echo, XCAR (c))) + && !(EQ (Qswitch_frame, XCAR (c))) + /* Don't wipe echo area for select window events: These might + get delayed via `mouse-autoselect-window' (Bug#11304). */ + && !(EQ (Qselect_window, XCAR (c))))) { if (!NILP (echo_area_buffer[0])) { diff --git a/src/lread.c b/src/lread.c index ec54d2d81ad..9910db27de7 100644 --- a/src/lread.c +++ b/src/lread.c @@ -705,13 +705,8 @@ read_filtered_event (bool no_switch_frame, bool ascii_required, /* Read until we get an acceptable event. */ retry: do - { - ptrdiff_t count = SPECPDL_INDEX (); - specbind (Qecho_keystrokes, Qnil); - val = read_char (0, Qnil, (input_method ? Qnil : Qt), 0, - NUMBERP (seconds) ? &end_time : NULL); - unbind_to (count, Qnil); - } + val = read_char (0, Qnil, (input_method ? Qnil : Qt), 0, + NUMBERP (seconds) ? &end_time : NULL); while (FIXNUMP (val) && XFIXNUM (val) == -2); /* wrong_kboard_jmpbuf */ if (BUFFERP (val)) |