comparison src/window.c @ 71041:8aeb086972ae

(struct saved_window): Add `dedicated'. (Fset_window_configuration, save_window_save): Save/restore the `dedicated' flag.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 29 May 2006 01:05:24 +0000
parents 6e5b403b5586
children c53dfaf68575
comparison
equal deleted inserted replaced
71040:549b9a50b995 71041:8aeb086972ae
5792 Lisp_Object display_table; 5792 Lisp_Object display_table;
5793 Lisp_Object orig_top_line, orig_total_lines; 5793 Lisp_Object orig_top_line, orig_total_lines;
5794 Lisp_Object left_margin_cols, right_margin_cols; 5794 Lisp_Object left_margin_cols, right_margin_cols;
5795 Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins; 5795 Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins;
5796 Lisp_Object scroll_bar_width, vertical_scroll_bar_type; 5796 Lisp_Object scroll_bar_width, vertical_scroll_bar_type;
5797 Lisp_Object dedicated;
5797 }; 5798 };
5798 5799
5799 #define SAVED_WINDOW_N(swv,n) \ 5800 #define SAVED_WINDOW_N(swv,n) \
5800 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) 5801 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)])))
5801 5802
5802 DEFUN ("window-configuration-p", Fwindow_configuration_p, Swindow_configuration_p, 1, 1, 0, 5803 DEFUN ("window-configuration-p", Fwindow_configuration_p, Swindow_configuration_p, 1, 1, 0,
5803 doc: /* Return t if OBJECT is a window-configuration object. */) 5804 doc: /* Return t if OBJECT is a window-configuration object. */)
5804 (object) 5805 (object)
5805 Lisp_Object object; 5806 Lisp_Object object;
5806 { 5807 {
5807 if (WINDOW_CONFIGURATIONP (object)) 5808 return WINDOW_CONFIGURATIONP (object) ? Qt : Qnil;
5808 return Qt;
5809 return Qnil;
5810 } 5809 }
5811 5810
5812 DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_configuration_frame, 1, 1, 0, 5811 DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_configuration_frame, 1, 1, 0,
5813 doc: /* Return the frame that CONFIG, a window-configuration object, is about. */) 5812 doc: /* Return the frame that CONFIG, a window-configuration object, is about. */)
5814 (config) 5813 (config)
6026 w->left_fringe_width = p->left_fringe_width; 6025 w->left_fringe_width = p->left_fringe_width;
6027 w->right_fringe_width = p->right_fringe_width; 6026 w->right_fringe_width = p->right_fringe_width;
6028 w->fringes_outside_margins = p->fringes_outside_margins; 6027 w->fringes_outside_margins = p->fringes_outside_margins;
6029 w->scroll_bar_width = p->scroll_bar_width; 6028 w->scroll_bar_width = p->scroll_bar_width;
6030 w->vertical_scroll_bar_type = p->vertical_scroll_bar_type; 6029 w->vertical_scroll_bar_type = p->vertical_scroll_bar_type;
6030 w->dedicated = p->dedicated;
6031 XSETFASTINT (w->last_modified, 0); 6031 XSETFASTINT (w->last_modified, 0);
6032 XSETFASTINT (w->last_overlay_modified, 0); 6032 XSETFASTINT (w->last_overlay_modified, 0);
6033 6033
6034 /* Reinstall the saved buffer and pointers into it. */ 6034 /* Reinstall the saved buffer and pointers into it. */
6035 if (NILP (p->buffer)) 6035 if (NILP (p->buffer))
6295 p->left_fringe_width = w->left_fringe_width; 6295 p->left_fringe_width = w->left_fringe_width;
6296 p->right_fringe_width = w->right_fringe_width; 6296 p->right_fringe_width = w->right_fringe_width;
6297 p->fringes_outside_margins = w->fringes_outside_margins; 6297 p->fringes_outside_margins = w->fringes_outside_margins;
6298 p->scroll_bar_width = w->scroll_bar_width; 6298 p->scroll_bar_width = w->scroll_bar_width;
6299 p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; 6299 p->vertical_scroll_bar_type = w->vertical_scroll_bar_type;
6300 p->dedicated = w->dedicated;
6300 if (!NILP (w->buffer)) 6301 if (!NILP (w->buffer))
6301 { 6302 {
6302 /* Save w's value of point in the window configuration. 6303 /* Save w's value of point in the window configuration.
6303 If w is the selected window, then get the value of point 6304 If w is the selected window, then get the value of point
6304 from the buffer; pointm is garbage in the selected window. */ 6305 from the buffer; pointm is garbage in the selected window. */