aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorStefan Monnier2006-05-29 01:05:24 +0000
committerStefan Monnier2006-05-29 01:05:24 +0000
commit6ad0381ce14cbb2b348c62ce57c00a50929f7cf8 (patch)
tree94aa0bfe2cb7fb99aa764c7660c996504d804f3d /src/window.c
parent7311509ee6842235502d446a4aaf16d3f0a6e068 (diff)
downloademacs-6ad0381ce14cbb2b348c62ce57c00a50929f7cf8.tar.gz
emacs-6ad0381ce14cbb2b348c62ce57c00a50929f7cf8.zip
(struct saved_window): Add `dedicated'.
(Fset_window_configuration, save_window_save): Save/restore the `dedicated' flag.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c
index 772ee18b08c..20bf204e76b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5794,6 +5794,7 @@ struct saved_window
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) \
@@ -5804,9 +5805,7 @@ DEFUN ("window-configuration-p", Fwindow_configuration_p, Swindow_configuration_
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
5812DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_configuration_frame, 1, 1, 0, 5811DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_configuration_frame, 1, 1, 0,
@@ -6028,6 +6027,7 @@ the return value is nil. Otherwise the value is t. */)
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
@@ -6297,6 +6297,7 @@ save_window_save (window, vector, i)
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.