diff options
| author | Gerd Moellmann <[email protected]> | 2000-07-03 07:51:18 +0000 |
|---|---|---|
| committer | Gerd Moellmann <[email protected]> | 2000-07-03 07:51:18 +0000 |
| commit | 551645f8851339e8e92c703284fb9d7d85325786 (patch) | |
| tree | 029325b351da6404b045f9892066cdbaaafb7af2 /src/frame.c | |
| parent | 2faf048a41e463385a5d7202d3aa7707fbacb525 (diff) | |
(next_frame, prev_frame): If MINIBUF is a window,
include those frames as candidates which have their focus
redirected to the minibuffer frame.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/frame.c b/src/frame.c index 2217b63037..efbf7a1225 100644 --- 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)) |