summaryrefslogtreecommitdiff
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2019-03-04 10:11:53 +0100
committerMartin Rudalics <rudalics@gmx.at>2019-03-04 10:11:53 +0100
commita810a75aa2d0cd5f43ec4b733fdcafabbfe8c5c3 (patch)
tree1fc14d1682958f204e8e0e8d514f230e22566650 /src/keyboard.c
parent716ff449ef0ee87e7a102733d8c036bc8e037076 (diff)
downloademacs-a810a75aa2d0cd5f43ec4b733fdcafabbfe8c5c3.tar.gz
Fix minibuffer resizing with temporarily selected frames (Bug#34317)
* src/keyboard.c (command_loop_1): Resize echo area exactly only if the echo area window is the minibuffer window of the selected frame (Bug#34317). * src/xdisp.c (x_consider_frame_title): Inhibit redisplay also when restoring the selected window/frame to avoid that resize_mini_window sizes back the minibuffer window of a temporarily selected frame (Bug#34317).
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 1bde3a13ba5..760cd623f63 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1476,8 +1476,12 @@ command_loop_1 (void)
safe_run_hooks (Qpost_command_hook);
/* If displaying a message, resize the echo area window to fit
- that message's size exactly. */
- if (!NILP (echo_area_buffer[0]))
+ that message's size exactly. Do this only if the echo area
+ window is the minibuffer window of the selected frame. See
+ Bug#34317. */
+ if (!NILP (echo_area_buffer[0])
+ && (EQ (echo_area_window,
+ FRAME_MINIBUF_WINDOW (XFRAME (selected_frame)))))
resize_echo_area_exactly ();
/* If there are warnings waiting, process them. */