Mercurial > emacs
comparison src/window.c @ 34786:a9b2c624a8a2
(delete_window, Fsplit_window)
(Fset_window_configuration): Calls to ensure_frame_matrix removed.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Thu, 21 Dec 2000 15:38:38 +0000 |
parents | b17790c2efbf |
children | 7fcb09b535b4 |
comparison
equal
deleted
inserted
replaced
34785:5e0e7780f7f0 | 34786:a9b2c624a8a2 |
---|---|
1188 | 1188 |
1189 windows_or_buffers_changed++; | 1189 windows_or_buffers_changed++; |
1190 Vwindow_list = Qnil; | 1190 Vwindow_list = Qnil; |
1191 frame = XFRAME (WINDOW_FRAME (p)); | 1191 frame = XFRAME (WINDOW_FRAME (p)); |
1192 FRAME_WINDOW_SIZES_CHANGED (frame) = 1; | 1192 FRAME_WINDOW_SIZES_CHANGED (frame) = 1; |
1193 ensure_frame_matrix (frame); | |
1194 | 1193 |
1195 /* Are we trying to delete any frame's selected window? */ | 1194 /* Are we trying to delete any frame's selected window? */ |
1196 { | 1195 { |
1197 Lisp_Object frame, pwindow; | 1196 Lisp_Object frame, pwindow; |
1198 | 1197 |
3199 error ("Attempt to split minibuffer window"); | 3198 error ("Attempt to split minibuffer window"); |
3200 else if (window_fixed_size_p (o, !NILP (horflag), 0)) | 3199 else if (window_fixed_size_p (o, !NILP (horflag), 0)) |
3201 error ("Attempt to split fixed-size window"); | 3200 error ("Attempt to split fixed-size window"); |
3202 | 3201 |
3203 check_min_window_sizes (); | 3202 check_min_window_sizes (); |
3204 ensure_frame_matrix (fo); | |
3205 | 3203 |
3206 if (NILP (horflag)) | 3204 if (NILP (horflag)) |
3207 { | 3205 { |
3208 if (size_int < window_min_height) | 3206 if (size_int < window_min_height) |
3209 error ("Window height %d too small (after splitting)", size_int); | 3207 error ("Window height %d too small (after splitting)", size_int); |
4703 old_point = PT; | 4701 old_point = PT; |
4704 } | 4702 } |
4705 | 4703 |
4706 frame = XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame; | 4704 frame = XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame; |
4707 f = XFRAME (frame); | 4705 f = XFRAME (frame); |
4708 ensure_frame_matrix (f); | |
4709 | 4706 |
4710 /* If f is a dead frame, don't bother rebuilding its window tree. | 4707 /* If f is a dead frame, don't bother rebuilding its window tree. |
4711 However, there is other stuff we should still try to do below. */ | 4708 However, there is other stuff we should still try to do below. */ |
4712 if (FRAME_LIVE_P (f)) | 4709 if (FRAME_LIVE_P (f)) |
4713 { | 4710 { |