projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
16dfe04
)
* src/window.c (select_window): Fix assert for buffer = non-active minibuffer
author
Alan Mackenzie
<acm@muc.de>
Fri, 19 Aug 2022 15:06:38 +0000
(15:06 +0000)
committer
Alan Mackenzie
<acm@muc.de>
Fri, 19 Aug 2022 15:06:38 +0000
(15:06 +0000)
src/window.c
patch
|
blob
|
history
diff --git
a/src/window.c
b/src/window.c
index 2576b66a181a3c82568117fa162dc87e059f0316..35ec2a1f90862b0b3af9725f480aa0d421123fb0 100644
(file)
--- 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