(direct_output_for_insert): Fix check for mini-window

currently displaying a message.

diff --git a/src/ChangeLog b/src/ChangeLog
index b67fa850781fb0f017448b12177a2545ca8df1c3..8a3ae831ea30fe7e6b3726bad1ba8f067a29c0bb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-19  Gerd Moellmann  <gerd@gnu.org>
 
+       * dispnew.c (direct_output_for_insert): Fix check for mini-window
+       currently displaying a message.
+
        * bytecode.c (toplevel) [CHECK_FRAME_FONT]: Include frame.h and
        xterm.h.
        (Fbyte_code) [CHECK_FRAME_FONT]: Check the selected frame's font.

diff --git a/src/dispnew.c b/src/dispnew.c
index dcff59d569865ef1874abee3eb719a2d11ef3955..721d5186b6c4c27702bd6db522bdf8565382d677 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3180,8 +3180,10 @@ direct_output_for_insert (g)
       || !display_completed
       /* Give up if buffer appears in two places.  */
       || buffer_shared > 1
-      /* Give up if w is mini-buffer and a message is being displayed there */
-      || (MINI_WINDOW_P (w) && !NILP (echo_area_buffer[0]))
+      /* Give up if currently displaying a message instead of the
+        minibuffer contents.  */
+      || (EQ (selected_window, minibuf_window)
+         && EQ (minibuf_window, echo_area_window))
       /* Give up for hscrolled mini-buffer because display of the prompt
         is handled specially there (see display_line).  */
       || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll))