(next_frame, prev_frame): If MINIBUF is a window,

include those frames as candidates which have their focus
redirected to the minibuffer frame.

diff --git a/src/frame.c b/src/frame.c
index 2217b630374d839cdcf6e2343c6f9d4835f48d67..efbf7a122596fe04264cfab46de379a798796835 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -943,22 +943,11 @@ next_frame (frame, minibuf)
              }
            else if (WINDOWP (minibuf))
              {
-#if 0 /* I don't think the test for frame focus redirection is
-         correct.  This excludes frames "using the current minibuffer"
-         when their focus isn't redirected, which contradicts the doc
-         string of next-frame.  --gerd, 2000-06-30 */
                if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf)
-                   /* Check that F either is, or has forwarded its focus to,
-                      MINIBUF's frame.  */
-                   && (EQ (WINDOW_FRAME (XWINDOW (minibuf)), f)
-                       || EQ (WINDOW_FRAME (XWINDOW (minibuf)),
-                              FRAME_FOCUS_FRAME (XFRAME (f)))))
+                   || EQ (WINDOW_FRAME (XWINDOW (minibuf)), f)
+                   || EQ (WINDOW_FRAME (XWINDOW (minibuf)),
+                          FRAME_FOCUS_FRAME (XFRAME (f))))
                  return f;
-#else /* not 0 */
-               if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf)
-                   || EQ (WINDOW_FRAME (XWINDOW (minibuf)), f))
-                 return f;
-#endif /* not 0 */
              }
            else
              return f;
@@ -1013,11 +1002,9 @@ prev_frame (frame, minibuf)
          else if (WINDOWP (minibuf))
            {
              if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf)
-                 /* Check that F either is, or has forwarded its focus to,
-                    MINIBUF's frame.  */
-                 && (EQ (WINDOW_FRAME (XWINDOW (minibuf)), f)
-                     || EQ (WINDOW_FRAME (XWINDOW (minibuf)),
-                            FRAME_FOCUS_FRAME (XFRAME (f)))))
+                 || EQ (WINDOW_FRAME (XWINDOW (minibuf)), f)
+                 || EQ (WINDOW_FRAME (XWINDOW (minibuf)),
+                        FRAME_FOCUS_FRAME (XFRAME (f))))
                prev = f;
            }
          else if (EQ (minibuf, Qvisible))