[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 9c0eec4ed8: * src/window.c (select_window): Fix assert for buff
From: |
Alan Mackenzie |
Subject: |
emacs-28 9c0eec4ed8: * src/window.c (select_window): Fix assert for buffer = non-active minibuffer |
Date: |
Fri, 19 Aug 2022 11:07:49 -0400 (EDT) |
branch: emacs-28
commit 9c0eec4ed86713519819b2e33dc3fff23f0e5f3d
Author: Alan Mackenzie <acm@muc.de>
Commit: Alan Mackenzie <acm@muc.de>
* src/window.c (select_window): Fix assert for buffer = non-active
minibuffer
---
src/window.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/window.c b/src/window.c
index 2576b66a18..35ec2a1f90 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 9c0eec4ed8: * src/window.c (select_window): Fix assert for buffer = non-active minibuffer,
Alan Mackenzie <=