Fix frame focus redirection with shared minibuffer windows (Bug#24500)

* src/frame.c (do_switch_frame): Redirect frame focus also when
the frame switched to has its minibuffer window on the selected
frame.
* src/window.c (candidate_window_p): To qualify as candidate
it's not sufficient for the window's frame to just share the
minibuffer window - it must be active as well.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/frame.c b/src/frame.c
index 45559b0be98..a1c2199d044 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1160,7 +1160,12 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
       if (FRAMEP (xfocus))
         {
           focus = FRAME_FOCUS_FRAME (XFRAME (xfocus));
-          if (FRAMEP (focus) && XFRAME (focus) == SELECTED_FRAME ())
+          if ((FRAMEP (focus) && XFRAME (focus) == SELECTED_FRAME ())
+              /* Redirect frame focus also when FRAME has its minibuffer
+                 window on the selected frame (see Bug#24500).  */
+              || (NILP (focus)
+                  && EQ (FRAME_MINIBUF_WINDOW (XFRAME (frame)),
+                         sf->selected_window)))
             Fredirect_frame_focus (xfocus, frame);
         }
     }