Mercurial > emacs
comparison src/window.c @ 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 |
comparison
equal
deleted
inserted
replaced
6267:c10a162546f0 | 6268:43853122823f |
---|---|
1178 | 1178 |
1179 /* Pick the next window now, since some operations will delete | 1179 /* Pick the next window now, since some operations will delete |
1180 the current window. */ | 1180 the current window. */ |
1181 next_window = Fnext_window (w, mini ? Qt : Qnil, frame_arg); | 1181 next_window = Fnext_window (w, mini ? Qt : Qnil, frame_arg); |
1182 | 1182 |
1183 #ifdef MULTI_FRAME | 1183 /* Note that we do not pay attention here to whether |
1184 if (frame != 0 && EQ (frames, Qt) | 1184 the frame is visible, since Fnext_window skips non-visible frames |
1185 && FRAME_VISIBLE_P (w_frame)) | 1185 if that is desired, under the control of frame_arg. */ |
1186 continue; | |
1187 #endif | |
1188 if (! MINI_WINDOW_P (XWINDOW (w)) | 1186 if (! MINI_WINDOW_P (XWINDOW (w)) |
1189 || (mini && minibuf_level > 0)) | 1187 || (mini && minibuf_level > 0)) |
1190 switch (type) | 1188 switch (type) |
1191 { | 1189 { |
1192 case GET_BUFFER_WINDOW: | 1190 case GET_BUFFER_WINDOW: |
1193 /* Ignore invisible and iconified frames. */ | |
1194 if (! FRAME_VISIBLE_P (w_frame) | |
1195 || FRAME_ICONIFIED_P (w_frame)) | |
1196 break; | |
1197 if (XBUFFER (XWINDOW (w)->buffer) == XBUFFER (obj)) | 1191 if (XBUFFER (XWINDOW (w)->buffer) == XBUFFER (obj)) |
1198 return w; | 1192 return w; |
1199 break; | 1193 break; |
1200 | 1194 |
1201 case GET_LRU_WINDOW: | 1195 case GET_LRU_WINDOW: |
1202 /* t as arg means consider only full-width windows */ | 1196 /* t as arg means consider only full-width windows */ |
1203 if (!NILP (obj) && XFASTINT (XWINDOW (w)->width) | 1197 if (!NILP (obj) && XFASTINT (XWINDOW (w)->width) |
1204 != FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (w))))) | 1198 != FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (w))))) |
1205 break; | 1199 break; |
1206 #if 0 | |
1207 /* Ignore invisible and iconified frames. */ | |
1208 if (! FRAME_VISIBLE_P (XFRAME (WINDOW_FRAME (XWINDOW (w)))) | |
1209 || FRAME_ICONIFIED_P (XFRAME (WINDOW_FRAME (XWINDOW (w))))) | |
1210 break; | |
1211 #endif | |
1212 /* Ignore dedicated windows and minibuffers. */ | 1200 /* Ignore dedicated windows and minibuffers. */ |
1213 if (MINI_WINDOW_P (XWINDOW (w)) | 1201 if (MINI_WINDOW_P (XWINDOW (w)) |
1214 || !NILP (XWINDOW (w)->dedicated)) | 1202 || !NILP (XWINDOW (w)->dedicated)) |
1215 break; | 1203 break; |
1216 if (NILP (best_window) | 1204 if (NILP (best_window) |
1243 Fdelete_window (w); | 1231 Fdelete_window (w); |
1244 } | 1232 } |
1245 break; | 1233 break; |
1246 | 1234 |
1247 case GET_LARGEST_WINDOW: | 1235 case GET_LARGEST_WINDOW: |
1248 #if 0 | |
1249 /* Ignore invisible and iconified frames. */ | |
1250 if (! FRAME_VISIBLE_P (XFRAME (WINDOW_FRAME (XWINDOW (w)))) | |
1251 || FRAME_ICONIFIED_P (XFRAME (WINDOW_FRAME (XWINDOW (w))))) | |
1252 break; | |
1253 #endif | |
1254 /* Ignore dedicated windows and minibuffers. */ | 1236 /* Ignore dedicated windows and minibuffers. */ |
1255 if (MINI_WINDOW_P (XWINDOW (w)) | 1237 if (MINI_WINDOW_P (XWINDOW (w)) |
1256 || !NILP (XWINDOW (w)->dedicated)) | 1238 || !NILP (XWINDOW (w)->dedicated)) |
1257 break; | 1239 break; |
1258 { | 1240 { |