From 4e907fa3295e1d3ce2220a2bb9bd984afdec740a Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Tue, 20 Apr 2021 10:53:02 +0000 Subject: [PATCH] Fix bug #47781: (window-list-1 nil t) wrongly returned nil. * src/window.c (candidate_window_p): In the WINDOW_P (all_frames) branch of the conditional, insert "EQ (minibuf, Qt)" in the requisite place. --- src/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/window.c b/src/window.c index 9a49032ba8a..a22fab24441 100644 --- a/src/window.c +++ b/src/window.c @@ -2648,7 +2648,8 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, candidate_p = ((EQ (XWINDOW (all_frames)->frame, w->frame) || (EQ (f->minibuffer_window, all_frames) && EQ (XWINDOW (all_frames)->frame, FRAME_FOCUS_FRAME (f)))) - && !is_minibuffer (0, XWINDOW (all_frames)->contents)); + && (EQ (minibuf, Qt) + || !is_minibuffer (0, XWINDOW (all_frames)->contents))); else if (FRAMEP (all_frames)) candidate_p = EQ (all_frames, w->frame); -- 2.39.5