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

Fixes: debbugs:15332

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e08178989ead1f43812a76fe12f6832d595cb05..e609c38be7eac33bc56c8a8ccddfd1ea8fb0a957 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+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>
 
        * eval.c (Feval): Document the new use of `lexical'.

diff --git a/src/keyboard.c b/src/keyboard.c
index 440820c57dbf25c423a1e0d5ea9726cde076ba5a..a768c9bb409a7379ee1ca48af15ba55ad426ebcc 100644 (file)
--- 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))