Mercurial > emacs
changeset 6268:43853122823f
(window_loop): Delete MULTI_FRAME
conditional within the loop, spuriously added in prev change.
Don't ignore invisible or iconified frames for GET_BUFFER_WINDOW;
instead, let Fnext_window skip them if appropriate.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 09 Mar 1994 05:59:08 +0000 |
| parents | c10a162546f0 |
| children | 8bd31035cf90 |
| files | src/window.c |
| diffstat | 1 files changed, 3 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Wed Mar 09 04:17:47 1994 +0000 +++ b/src/window.c Wed Mar 09 05:59:08 1994 +0000 @@ -1180,20 +1180,14 @@ the current window. */ next_window = Fnext_window (w, mini ? Qt : Qnil, frame_arg); -#ifdef MULTI_FRAME - if (frame != 0 && EQ (frames, Qt) - && FRAME_VISIBLE_P (w_frame)) - continue; -#endif + /* Note that we do not pay attention here to whether + the frame is visible, since Fnext_window skips non-visible frames + if that is desired, under the control of frame_arg. */ if (! MINI_WINDOW_P (XWINDOW (w)) || (mini && minibuf_level > 0)) switch (type) { case GET_BUFFER_WINDOW: - /* Ignore invisible and iconified frames. */ - if (! FRAME_VISIBLE_P (w_frame) - || FRAME_ICONIFIED_P (w_frame)) - break; if (XBUFFER (XWINDOW (w)->buffer) == XBUFFER (obj)) return w; break; @@ -1203,12 +1197,6 @@ if (!NILP (obj) && XFASTINT (XWINDOW (w)->width) != FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (w))))) break; -#if 0 - /* Ignore invisible and iconified frames. */ - if (! FRAME_VISIBLE_P (XFRAME (WINDOW_FRAME (XWINDOW (w)))) - || FRAME_ICONIFIED_P (XFRAME (WINDOW_FRAME (XWINDOW (w))))) - break; -#endif /* Ignore dedicated windows and minibuffers. */ if (MINI_WINDOW_P (XWINDOW (w)) || !NILP (XWINDOW (w)->dedicated)) @@ -1245,12 +1233,6 @@ break; case GET_LARGEST_WINDOW: -#if 0 - /* Ignore invisible and iconified frames. */ - if (! FRAME_VISIBLE_P (XFRAME (WINDOW_FRAME (XWINDOW (w)))) - || FRAME_ICONIFIED_P (XFRAME (WINDOW_FRAME (XWINDOW (w))))) - break; -#endif /* Ignore dedicated windows and minibuffers. */ if (MINI_WINDOW_P (XWINDOW (w)) || !NILP (XWINDOW (w)->dedicated))