diff src/alloc.c @ 83123:ad01ab3c6f4d

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-299 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-300 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-301 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-302 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-303 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-304 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-305 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-306 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-307 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-308 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-309 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-310 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-311 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-312 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-313 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-314 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-315 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-316 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-317 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-318 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-319 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-320 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-321 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-322 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-323 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-324 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-163

--- a/src/alloc.c	Tue May 11 09:12:09 2004 +0000
+++ b/src/alloc.c	Tue May 18 19:12:15 2004 +0000
@@ -845,7 +845,7 @@
   free_ablock = ablock;
   /* Update busy count.  */
   ABLOCKS_BUSY (abase) = (struct ablocks *) (-2 + (long) ABLOCKS_BUSY (abase));
-  
+
   if (2 > (long) ABLOCKS_BUSY (abase))
     { /* All the blocks are free.  */
       int i = 0, aligned = (long) ABLOCKS_BUSY (abase);
@@ -4467,6 +4467,17 @@
   mark_kboards ();
   mark_ttys ();
 
+#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
+  mark_stack ();
+#endif
+
+#ifdef USE_GTK
+  {
+    extern void xg_mark_data ();
+    xg_mark_data ();
+  }
+#endif
+
   /* Look thru every buffer's undo list
      for elements that update markers that were not marked,
      and delete them.  */
@@ -4510,17 +4521,6 @@
       }
   }
 
-#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
-  mark_stack ();
-#endif
-
-#ifdef USE_GTK
-  {
-    extern void xg_mark_data ();
-    xg_mark_data ();
-  }
-#endif
-
   gc_sweep ();
 
   /* Clear the mark bits that we set in certain root slots.  */
@@ -4978,6 +4978,14 @@
       break;
 
     case Lisp_Misc:
+      if (XMISCTYPE (obj) == Lisp_Misc_Free)
+	{
+	  /* This is (probably) a freed marker which may still exist on
+	     a buffer undo list, so accept it here, as check below will
+	     fail (not live).  KFS 2004-05-17 */
+	  XMARKER (obj)->gcmarkbit = 1;
+	  break;
+	}
       CHECK_ALLOCATED_AND_LIVE (live_misc_p);
       if (XMARKER (obj)->gcmarkbit)
 	break;