Mercurial > emacs
changeset 29995:ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
include those frames as candidates which have their focus
redirected to the minibuffer frame.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Mon, 03 Jul 2000 07:51:18 +0000 |
| parents | b5da88c41066 |
| children | f784be5b6130 |
| files | src/frame.c |
| diffstat | 1 files changed, 6 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Mon Jul 03 07:50:42 2000 +0000 +++ b/src/frame.c Mon Jul 03 07:51:18 2000 +0000 @@ -943,22 +943,11 @@ } 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 @@ 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))