1 files changed, 5 insertions, 0 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 925eed8d6ff..4b26633c7e7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6139,6 +6139,11 @@ with_echo_area_buffer (w, which, fn, a1, a2, a3, a4)
 
   buffer = echo_area_buffer[this_one];
 
+  /* Don't get confused by reusing the buffer used for echoing
+     for a different purpose.  */
+  if (!echoing && EQ (buffer, echo_message_buffer))
+    cancel_echoing ();
+
   record_unwind_protect (unwind_with_echo_area_buffer,
                          with_echo_area_buffer_unwind_data (w));