* alloc.c (mark_object): Revert window marking code

since it's unsafe for the Fset_window_configuration.

diff --git a/src/ChangeLog b/src/ChangeLog
index 24d290e163da5b245fa9abd3c3548e671a6ec51a..990cba396e35b28193f9aa06b47b5df7998b28d3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * alloc.c (mark_object): Revert window marking code
+       since it's unsafe for the Fset_window_configuration.
+
 2012-09-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix race conditions with signal handlers and errno.

diff --git a/src/alloc.c b/src/alloc.c
index e90cca637dffb548fa1d77648be613cf2e27e488..aca0a82d1b5ae5633227ec77f66b2ce7bb267b79 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6019,22 +6019,18 @@ mark_object (Lisp_Object arg)
          case PVEC_WINDOW:
            {
              struct window *w = (struct window *) ptr;
-             bool leaf = NILP (w->hchild) && NILP (w->vchild);
-
-             if (leaf && NILP (w->buffer))
-               /* If the window is deleted, mark just the window itself.  */
-               VECTOR_MARK (ptr);
-             else
+             
+             /* Even if the window is deleted, we can't mark just the window
+                itself because set-window-configuration can resurrect it.  */
+             mark_vectorlike (ptr);
+             /* Mark glyphs for leaf windows.  Marking window
+                matrices is sufficient because frame matrices
+                use the same glyph memory.  */
+             if (NILP (w->hchild) && NILP (w->vchild)
+                 && w->current_matrix)
                {
-                 mark_vectorlike (ptr);
-                 /* Mark glyphs for leaf windows.  Marking window
-                    matrices is sufficient because frame matrices
-                    use the same glyph memory.  */
-                 if (leaf && w->current_matrix)
-                   {
-                     mark_glyph_matrix (w->current_matrix);
-                     mark_glyph_matrix (w->desired_matrix);
-                   }
+                 mark_glyph_matrix (w->current_matrix);
+                 mark_glyph_matrix (w->desired_matrix);
                }
            }
            break;