diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-03-09 05:59:08 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-03-09 05:59:08 +0000 |
| commit | d29a5631671bee9a2dbffa320ad4cf90eb697567 (patch) | |
| tree | ea7ab9a700bc084a7e63c3b973e547ba2d23cab0 /src | |
| parent | 671cfd1aa3792fa1aff4b488097924eeb88e15e4 (diff) | |
| download | emacs-d29a5631671bee9a2dbffa320ad4cf90eb697567.tar.gz | |
(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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/window.c b/src/window.c index 6b6296a807c..479512b1b4d 100644 --- a/src/window.c +++ b/src/window.c @@ -1180,20 +1180,14 @@ window_loop (type, obj, mini, frames) 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 @@ window_loop (type, obj, mini, frames) 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 @@ window_loop (type, obj, mini, frames) 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)) |