summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2021-04-20 10:53:02 +0000
committerAlan Mackenzie <acm@muc.de>2021-04-20 10:53:02 +0000
commit4e907fa3295e1d3ce2220a2bb9bd984afdec740a (patch)
treeebf9831c5ca62d1f2a6c3ecbbf92d953ebd04df4 /src
parent55db25b2579e5d84dfcf3a15957fc7a827abf25f (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/window.c3
1 files changed, 2 insertions, 1 deletions
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);