Commit c74e645b authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(direct_output_for_insert): Fix check for mini-window

currently displaying a message.
parent 741e56a0
2000-12-19 Gerd Moellmann <gerd@gnu.org> 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 * bytecode.c (toplevel) [CHECK_FRAME_FONT]: Include frame.h and
xterm.h. xterm.h.
(Fbyte_code) [CHECK_FRAME_FONT]: Check the selected frame's font. (Fbyte_code) [CHECK_FRAME_FONT]: Check the selected frame's font.
......
...@@ -3180,8 +3180,10 @@ direct_output_for_insert (g) ...@@ -3180,8 +3180,10 @@ direct_output_for_insert (g)
|| !display_completed || !display_completed
/* Give up if buffer appears in two places. */ /* Give up if buffer appears in two places. */
|| buffer_shared > 1 || buffer_shared > 1
/* Give up if w is mini-buffer and a message is being displayed there */ /* Give up if currently displaying a message instead of the
|| (MINI_WINDOW_P (w) && !NILP (echo_area_buffer[0])) minibuffer contents. */
|| (EQ (selected_window, minibuf_window)
&& EQ (minibuf_window, echo_area_window))
/* Give up for hscrolled mini-buffer because display of the prompt /* Give up for hscrolled mini-buffer because display of the prompt
is handled specially there (see display_line). */ is handled specially there (see display_line). */
|| (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment