]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix bug #47781: (window-list-1 nil t) wrongly returned nil.
authorAlan Mackenzie <acm@muc.de>
Tue, 20 Apr 2021 10:53:02 +0000 (10:53 +0000)
committerAlan Mackenzie <acm@muc.de>
Tue, 20 Apr 2021 10:53:02 +0000 (10:53 +0000)
* 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

index 9a49032ba8a663472406809a9d7b52b5ccb56634..a22fab244412a1317b4317cfcaa398a3a21afd7a 100644 (file)
@@ -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);