Mercurial > emacs
comparison src/window.c @ 65004:bc5cf5fc0f9e
(SAVED_WINDOW_VECTOR_SIZE): Remove dangerous define.
(Fcurrent_window_configuration): Use VECSIZE macro instead.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 16 Aug 2005 14:58:33 +0000 |
parents | a0d1312ede66 |
children | 25b770eb7993 532e0a9335a9 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
65003:74ab28cf1192 | 65004:bc5cf5fc0f9e |
---|---|
5622 Lisp_Object left_margin_cols, right_margin_cols; | 5622 Lisp_Object left_margin_cols, right_margin_cols; |
5623 Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins; | 5623 Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins; |
5624 Lisp_Object scroll_bar_width, vertical_scroll_bar_type; | 5624 Lisp_Object scroll_bar_width, vertical_scroll_bar_type; |
5625 }; | 5625 }; |
5626 | 5626 |
5627 #define SAVED_WINDOW_VECTOR_SIZE 24 /* Arg to Fmake_vector */ | |
5628 | |
5629 #define SAVED_WINDOW_N(swv,n) \ | 5627 #define SAVED_WINDOW_N(swv,n) \ |
5630 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) | 5628 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) |
5631 | 5629 |
5632 DEFUN ("window-configuration-p", Fwindow_configuration_p, Swindow_configuration_p, 1, 1, 0, | 5630 DEFUN ("window-configuration-p", Fwindow_configuration_p, Swindow_configuration_p, 1, 1, 0, |
5633 doc: /* Return t if OBJECT is a window-configuration object. */) | 5631 doc: /* Return t if OBJECT is a window-configuration object. */) |
6203 XSETINT (data->min_width, window_min_width); | 6201 XSETINT (data->min_width, window_min_width); |
6204 tem = Fmake_vector (make_number (n_windows), Qnil); | 6202 tem = Fmake_vector (make_number (n_windows), Qnil); |
6205 data->saved_windows = tem; | 6203 data->saved_windows = tem; |
6206 for (i = 0; i < n_windows; i++) | 6204 for (i = 0; i < n_windows; i++) |
6207 XVECTOR (tem)->contents[i] | 6205 XVECTOR (tem)->contents[i] |
6208 = Fmake_vector (make_number (SAVED_WINDOW_VECTOR_SIZE), Qnil); | 6206 = Fmake_vector (make_number (VECSIZE (struct saved_window)), Qnil); |
6209 save_window_save (FRAME_ROOT_WINDOW (f), XVECTOR (tem), 0); | 6207 save_window_save (FRAME_ROOT_WINDOW (f), XVECTOR (tem), 0); |
6210 XSETWINDOW_CONFIGURATION (tem, data); | 6208 XSETWINDOW_CONFIGURATION (tem, data); |
6211 return (tem); | 6209 return (tem); |
6212 } | 6210 } |
6213 | 6211 |