summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2022-08-19 15:06:38 +0000
committerAlan Mackenzie <acm@muc.de>2022-08-19 15:06:38 +0000
commit9c0eec4ed86713519819b2e33dc3fff23f0e5f3d (patch)
tree6b80e45ff3d8ff3bfdc23dbdd3f60946d4e5f79a /src
parent16dfe04be2c57fc82ccdd56cad97b39d559a5afe (diff)
downloademacs-9c0eec4ed86713519819b2e33dc3fff23f0e5f3d.tar.gz
* src/window.c (select_window): Fix assert for buffer = non-active minibuffer
Diffstat (limited to 'src')
-rw-r--r--src/window.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c
index 2576b66a181..35ec2a1f908 100644
--- a/src/window.c
+++ b/src/window.c
@@ -554,7 +554,9 @@ select_window (Lisp_Object window, Lisp_Object norecord,
frame is active. */
Fselect_frame (frame, norecord);
/* Fselect_frame called us back so we've done all the work already. */
- eassert (EQ (window, selected_window));
+ eassert (EQ (window, selected_window)
+ || (EQ (window, f->minibuffer_window)
+ && NILP (Fminibufferp (XWINDOW (window)->contents, Qt))));
return window;
}
else