2 files changed, 9 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a5179f83d27..c0b77fb4804 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2001-09-26  Gerd Moellmann  <gerd@gnu.org>
 
+        * xdisp.c (with_echo_area_buffer): Use echo_kboard instead
+        of the only tempoarily set echoing flag for deciding when
+        the cancel echoing.
+
+        * keyboard.c (echo_kboard): Make externally visible.
+
+        * lisp.h (echo_kboard): Declare extern.
+
         * xdisp.c (make_cursor_line_fully_visible): Return 0 and set
         fonts_changed_p if need larger matrices due to vscrolling.
         (try_scrolling, try_cursor_movement, redisplay_window): Give up on
diff --git a/src/xdisp.c b/src/xdisp.c
index eae5e9062fb..295bf1be5f6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6237,7 +6237,7 @@ with_echo_area_buffer (w, which, fn, a1, a2, a3, a4)
 
   /* Don't get confused by reusing the buffer used for echoing
      for a different purpose.  */
-  if (!echoing && EQ (buffer, echo_message_buffer))
+  if (echo_kboard == NULL && EQ (buffer, echo_message_buffer))
     cancel_echoing ();
 
   record_unwind_protect (unwind_with_echo_area_buffer,