2 files changed, 16 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f210ed382a6..c973a07f264 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,12 @@
         * coding.c (Ffind_operation_coding_system): Call a function by
         safe_call1 instead of call1.
 
+2006-05-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (struct saved_window): Add `dedicated'.
+        (Fset_window_configuration, save_window_save): Save/restore the
+        `dedicated' flag.
+
 2006-05-28  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (set_cursor_from_row): If cursor cannot be set in row,
@@ -32,8 +38,8 @@
 
 2006-05-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macselect.c (mac_handle_apple_event): Return
-        errAEEventNotHandled if key binding is not found.
+        * macselect.c (mac_handle_apple_event):
+        Return errAEEventNotHandled if key binding is not found.
 
 2006-05-26  Eli Zaretskii  <eliz@gnu.org>
 
@@ -44,9 +50,9 @@
 
 2006-05-26  Chong Yidong  <cyd@stupidchicken.com>
 
-        * fileio.c (Fcopy_file): Delete argument MUSTBENEW.  Incorporate
-        the exclusive file-opening functionality into the behavior when
-        OK-IF-ALREADY-EXISTS is nil.
+        * fileio.c (Fcopy_file): Delete argument MUSTBENEW.
+        Incorporate the exclusive file-opening functionality into the behavior
+        when OK-IF-ALREADY-EXISTS is nil.
         (Frename_file): Call Fcopy_file without MUSTBENEW argument.
 
 2006-05-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
@@ -98,8 +104,7 @@
         load-history, except at preloading time.
 
         * lread.c (Fload): At preloading time, preserve the extension of
-        the filename which goes into load-history.  New variable
-        hist_file_name.
+        the filename which goes into load-history.  New var hist_file_name.
 
         * lread.c (Fload): Do eval-after-load stuff by calling the lisp
         function do-after-load-evaluation.
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
   Lisp_Object left_margin_cols, right_margin_cols;
   Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins;
   Lisp_Object scroll_bar_width, vertical_scroll_bar_type;
+  Lisp_Object dedicated;
 };
 
 #define SAVED_WINDOW_N(swv,n) \
@@ -5804,9 +5805,7 @@ DEFUN ("window-configuration-p", Fwindow_configuration_p, Swindow_configuration_
      (object)
      Lisp_Object object;
 {
-  if (WINDOW_CONFIGURATIONP (object))
-    return Qt;
-  return Qnil;
+  return WINDOW_CONFIGURATIONP (object) ? Qt : Qnil;
 }
 
 DEFUN ("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.  */)
           w->fringes_outside_margins = p->fringes_outside_margins;
           w->scroll_bar_width = p->scroll_bar_width;
           w->vertical_scroll_bar_type = p->vertical_scroll_bar_type;
+          w->dedicated = p->dedicated;
           XSETFASTINT (w->last_modified, 0);
           XSETFASTINT (w->last_overlay_modified, 0);
 
@@ -6297,6 +6297,7 @@ save_window_save (window, vector, i)
       p->fringes_outside_margins = w->fringes_outside_margins;
       p->scroll_bar_width = w->scroll_bar_width;
       p->vertical_scroll_bar_type = w->vertical_scroll_bar_type;
+      p->dedicated = w->dedicated;
       if (!NILP (w->buffer))
         {
           /* Save w's value of point in the window configuration.