From: Stefan Monnier Date: Wed, 11 Sep 2013 02:41:00 +0000 (-0400) Subject: * src/keyboard.c (read_char): Don't break immediate_echo. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1662^2~49 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=533f258f364353f40850c16bf50fa08af9dc46a8;p=emacs.git * src/keyboard.c (read_char): Don't break immediate_echo. Fixes: debbugs:15332 --- diff --git a/src/ChangeLog b/src/ChangeLog index 4e08178989e..e609c38be7e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-09-11 Stefan Monnier + + * keyboard.c (read_char): Don't break immediate_echo (bug#15332). + 2013-09-10 Stefan Monnier * eval.c (Feval): Document the new use of `lexical'. diff --git a/src/keyboard.c b/src/keyboard.c index 440820c57db..a768c9bb409 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -2596,9 +2596,7 @@ read_char (int commandflag, Lisp_Object map, if (/* There currently is something in the echo area. */ !NILP (echo_area_buffer[0]) - && (/* And it's either not from echoing. */ - !EQ (echo_area_buffer[0], echo_message_buffer) - /* Or it's an echo from a different kboard. */ + && (/* It's an echo from a different kboard. */ || echo_kboard != current_kboard /* Or we explicitly allow overwriting whatever there is. */ || ok_to_echo_at_next_pause == NULL))