Skip to content

GitLab

Commit 533f258f authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* src/keyboard.c (read_char): Don't break immediate_echo. 

Fixes: debbugs:15332
parent 34675540
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
src/ChangeLog
View file @ 533f258f
2013-09-11 Stefan Monnier <monnier@iro.umontreal.ca>
* keyboard.c (read_char): Don't break immediate_echo (bug#15332).
2013-09-10 Stefan Monnier <monnier@iro.umontreal.ca> 2013-09-10 Stefan Monnier <monnier@iro.umontreal.ca>
* eval.c (Feval): Document the new use of `lexical'. * eval.c (Feval): Document the new use of `lexical'.
......
src/keyboard.c
View file @ 533f258f
...@@ -2596,9 +2596,7 @@ read_char (int commandflag, Lisp_Object map, ...@@ -2596,9 +2596,7 @@ read_char (int commandflag, Lisp_Object map,
if (/* There currently is something in the echo area. */ if (/* There currently is something in the echo area. */
!NILP (echo_area_buffer[0]) !NILP (echo_area_buffer[0])
&& (/* And it's either not from echoing. */ && (/* It's an echo from a different kboard. */
!EQ (echo_area_buffer[0], echo_message_buffer)
/* Or it's an echo from a different kboard. */
|| echo_kboard != current_kboard || echo_kboard != current_kboard
/* Or we explicitly allow overwriting whatever there is. */ /* Or we explicitly allow overwriting whatever there is. */
|| ok_to_echo_at_next_pause == NULL)) || ok_to_echo_at_next_pause == NULL))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment