Mercurial > emacs
comparison src/window.c @ 7647:d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Put prev change in #ifdef MULTI_FRAME.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 23 May 1994 05:41:58 +0000 |
parents | 45298374e242 |
children | eb26954fb767 |
comparison
equal
deleted
inserted
replaced
7646:de2c4334fad4 | 7647:d93dff6fbc73 |
---|---|
1263 case UNSHOW_BUFFER: | 1263 case UNSHOW_BUFFER: |
1264 if (EQ (XWINDOW (w)->buffer, obj)) | 1264 if (EQ (XWINDOW (w)->buffer, obj)) |
1265 { | 1265 { |
1266 /* Find another buffer to show in this window. */ | 1266 /* Find another buffer to show in this window. */ |
1267 Lisp_Object another_buffer; | 1267 Lisp_Object another_buffer; |
1268 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (w))); | |
1268 another_buffer = Fother_buffer (obj, Qnil); | 1269 another_buffer = Fother_buffer (obj, Qnil); |
1269 if (NILP (another_buffer)) | 1270 if (NILP (another_buffer)) |
1270 another_buffer | 1271 another_buffer |
1271 = Fget_buffer_create (build_string ("*scratch*")); | 1272 = Fget_buffer_create (build_string ("*scratch*")); |
1272 XWINDOW (w)->dedicated = Qnil; | 1273 #ifdef MULTI_FRAME |
1273 Fset_window_buffer (w, another_buffer); | 1274 /* If this window is dedicated, and in a frame of its own, |
1274 if (EQ (w, selected_window)) | 1275 kill the frame. */ |
1275 Fset_buffer (XWINDOW (w)->buffer); | 1276 if (EQ (w, FRAME_ROOT_WINDOW (f)) |
1277 && XWINDOW (w)->dedicated | |
1278 && other_visible_frames (f)) | |
1279 Fdelete_frame (WINDOW_FRAME (XWINDOW (w)), Qnil); | |
1280 else | |
1281 #endif | |
1282 { | |
1283 /* Otherwise show a different buffer in the window. */ | |
1284 XWINDOW (w)->dedicated = Qnil; | |
1285 Fset_window_buffer (w, another_buffer); | |
1286 if (EQ (w, selected_window)) | |
1287 Fset_buffer (XWINDOW (w)->buffer); | |
1288 } | |
1276 } | 1289 } |
1277 break; | 1290 break; |
1278 } | 1291 } |
1279 | 1292 |
1280 if (EQ (w, last_window)) | 1293 if (EQ (w, last_window)) |