From c74e645b50fd09acfc0283e8c6cf197ce23153bc Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 19 Dec 2000 13:37:40 +0000 Subject: [PATCH] (direct_output_for_insert): Fix check for mini-window currently displaying a message. --- src/ChangeLog | 3 +++ src/dispnew.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b67fa850781..8a3ae831ea3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2000-12-19 Gerd Moellmann + * 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 dcff59d5698..721d5186b6c 100644 --- 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)) -- 2.39.2