# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 789038125 0
# Node ID e6e75fd0916d70f21e2232d2952e2746b7d6a0f8
# Parent  89f8d7f3bd7307375f12cb5ab7f5fa255df331c8
(mark_buffer, gc_sweep): Use BUF_INTERVALS.

(mark_buffer): In indirect buffer, mark the base buffer.

(mark_object): Make buffer case a branch of the Lisp_Vectorlike case.

diff -r 89f8d7f3bd73 -r e6e75fd0916d src/alloc.c
--- a/src/alloc.c	Mon Jan 02 06:51:21 1995 +0000
+++ b/src/alloc.c	Mon Jan 02 09:15:25 1995 +0000
@@ -1523,7 +1523,9 @@
       break;
 
     case Lisp_Vectorlike:
-      if (GC_SUBRP (obj))
+      if (GC_BUFFERP (obj))
+	mark_buffer (obj);
+      else if (GC_SUBRP (obj))
 	break;
       else if (GC_COMPILEDP (obj))
 	/* We could treat this just like a vector, but it is better
@@ -1703,11 +1705,6 @@
       break;
 #endif /* LISP_FLOAT_TYPE */
 
-    case Lisp_Buffer:
-      if (!XMARKBIT (XBUFFER (obj)->name))
-	mark_buffer (obj);
-      break;
-
     case Lisp_Int:
       break;
 
@@ -1724,12 +1721,13 @@
 {
   register struct buffer *buffer = XBUFFER (buf);
   register Lisp_Object *ptr;
+  Lisp_Object base_buffer;
 
   /* This is the buffer's markbit */
   mark_object (&buffer->name);
   XMARK (buffer->name);
 
-  MARK_INTERVAL_TREE (buffer->intervals);
+  MARK_INTERVAL_TREE (BUF_INTERVALS (buffer));
 
 #if 0
   mark_object (buffer->syntax_table);
@@ -1753,6 +1751,13 @@
        (char *)ptr < (char *)buffer + sizeof (struct buffer);
        ptr++)
     mark_object (ptr);
+
+  /* If this is an indirect buffer, mark its base buffer.  */
+  if (buffer->base_buffer)
+    {
+      XSETBUFFER (base_buffer, buffer->base_buffer); 
+      mark_buffer (base_buffer);
+    }
 }
 
 /* Sweep: find all structures not marked, and free them. */
@@ -1970,7 +1975,7 @@
       else
 	{
 	  XUNMARK (buffer->name);
-	  UNMARK_BALANCE_INTERVALS (buffer->intervals);
+	  UNMARK_BALANCE_INTERVALS (BUF_INTERVALS (buffer));
 
 #if 0
 	  /* Each `struct Lisp_String *' was turned into a Lisp_Object