mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-08 07:20:28 -08:00
Code Issues Projects Releases Wiki Activity

Ensure mini-window is resized to show active minibuffer contents

Browse source 
* src/keyboard.c (read_char, command_loop_1): Resize the
mini-window after clearing the echo area while minibuffer is
active.  (Bug#38645)
This commit is contained in:
Eli Zaretskii 2019-12-30 18:00:17 +02:00
parent 450633f85a
commit e3ec84fd7d
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/keyboard.c
View file

@ -1318,6 +1318,11 @@ command_loop_1 (void)
message1 (0); message1 (0);
safe_run_hooks (Qecho_area_clear_hook); safe_run_hooks (Qecho_area_clear_hook);
/* We cleared the echo area, and the minibuffer will now
show, so resize the mini-window in case the minibuffer
needs more or less space than the echo area. */
resize_mini_window (XWINDOW (minibuf_window), false);
unbind_to (count, Qnil); unbind_to (count, Qnil);
/* If a C-g came in before, treat it as input now. */ /* If a C-g came in before, treat it as input now. */
@ -2989,6 +2994,16 @@ read_char (int commandflag, Lisp_Object map,
{ {
safe_run_hooks (Qecho_area_clear_hook); safe_run_hooks (Qecho_area_clear_hook);
clear_message (1, 0); clear_message (1, 0);
/* If we were showing the echo-area message on top of an
active minibuffer, resize the mini-window, since the
minibuffer may need more or less space than the echo area
we've just wiped. */
if (minibuf_level
&& EQ (minibuf_window, echo_area_window)
/* The case where minibuffer-message-timeout is a number
was already handled near the beginning of command_loop_1. */
&& !NUMBERP (Vminibuffer_message_timeout))
resize_mini_window (XWINDOW (minibuf_window), false);
} }
else if (FUNCTIONP (Vclear_message_function)) else if (FUNCTIONP (Vclear_message_function))
clear_message (1, 0); clear_message (1, 0);