Changeset 3669

Timestamp:

04/07/05 08:23:24 (4 years ago)

Author:

miyoshi

Message:

* buffer.h (struct buffer): Sync up with Emacs CVS HEAD.

* alloc.c (Fgarbage_collect): Ditto. `undo_list' related codes are
merged.
(mark_buffer): Ditto.
(pdump_add_special_buffers): Use `undo_list' to get offset instead
of `name'.
(pdump_write_special_buffers): Ditto.
(pdump_load): Ditto.

Files:

• branches/2.2/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.2/src/alloc.c (modified) (6 diffs)
• branches/2.2/src/buffer.h (modified) (2 diffs)

branches/2.2/src/ChangeLog.Meadow

@@ +1 @@
+2005-04-07  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * buffer.h (struct buffer): Sync up with Emacs CVS HEAD.
+
+        * alloc.c (Fgarbage_collect): Ditto. `undo_list' related codes are
+        merged.
+        (mark_buffer): Ditto.
+        (pdump_add_special_buffers): Use `undo_list' to get offset instead
+        of `name'.
+        (pdump_write_special_buffers): Ditto.
+        (pdump_load): Ditto.
+
-2005-04-06  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.2/src/alloc.c

@@ -4900 +4900 @@
-              }
-          }
+        /* Now that we have stripped the elements that need not be in the
+           undo_list any more, we can finally mark the list.  */
+        mark_object (nextb->undo_list);
-
-        nextb = nextb->next;
@@ -5544 +5547 @@
-
-  MARK_INTERVAL_TREE (BUF_INTERVALS (buffer));
-
-  if (CONSP (buffer->undo_list))
-    {
-      Lisp_Object tail;
-      tail = buffer->undo_list;
-
-      while (CONSP (tail))
-        {
-          register struct Lisp_Cons *ptr = XCONS (tail);
-
-          if (XMARKBIT (ptr->car))
-            break;
-          XMARK (ptr->car);
-          if (GC_CONSP (ptr->car)
-              && ! XMARKBIT (XCAR (ptr->car))
-              && GC_MARKERP (XCAR (ptr->car)))
-            {
-              XMARK (XCAR (ptr->car));
-              mark_object (XCDR (ptr->car));
-            }
-          else
-            mark_object (ptr->car);
-
-          if (CONSP (ptr->cdr))
-            tail = ptr->cdr;
-          else
-            break;
-        }
-
-      mark_object (XCDR (tail));
-    }
-  else
-    mark_object (buffer->undo_list);
-
-  /* For now, we just don't mark the undo_list.  It's done later in
@@ -7104 +7074 @@
-  for (i = 0; buffers[i]; i++)
-    {
-undo_list
+name
-           offset < sizeof (struct buffer);
-           offset += (sizeof (Lisp_Object)))
@@ -7125 +7095 @@
-    int size =  sizeof (struct buffer)
-      + (char *)&buffer_local_flags
-undo_list
-undo_list
+name
+name
-  }
-
-  for (i = 0; buffers[i]; i++)
-undo_list
+name
-         offset < sizeof (struct buffer);
-         offset += (sizeof (Lisp_Object)))
@@ -7761 +7731 @@
-  /* load misc */
-  {
-undo_list
+name
-          (sizeof (struct buffer) + (char *)&buffer_local_flags
-undo_list
-undo_list
+name
+name
-          (sizeof (struct buffer) + (char *)&buffer_defaults
-undo_list
-undo_list
+name
+name
-          (sizeof (struct buffer) + (char *)&buffer_local_symbols
-undo_list
-undo_list
+name
+name
-          (sizeof (struct buffer) + (char *)&buffer_local_types
-undo_list
+name
-    if (offset != 0)
-      {
@@ -7781 +7751 @@
-                                    NULL};
-        for (i = 0; buffers[i]; i++)
-undo_list
+name
-               buff_offset < sizeof (struct buffer);
-               buff_offset += (sizeof (Lisp_Object)))

branches/2.2/src/buffer.h

@@ -532 +532 @@
-  unsigned prevent_redisplay_optimizations_p : 1;
-
-  /* Changes in the buffer are recorded here for undo.
-     t means don't record anything.
-     This information belongs to the base buffer of an indirect buffer,
-     But we can't store it in the  struct buffer_text
-     because local variables have to be right in the  struct buffer.
-     So we copy it around in set_buffer_internal.
-     This comes before `name' because it is marked in a special way.  */
-  Lisp_Object undo_list;
-
-  /* List of overlays that end at or before the current center,
-     in order of end-position.  */
@@ -591 +582 @@
-  /* Mode line element that controls format of mode line.  */
-  Lisp_Object mode_line_format;
+
+  /* Changes in the buffer are recorded here for undo.
+     t means don't record anything.
+     This information belongs to the base buffer of an indirect buffer,
+     But we can't store it in the  struct buffer_text
+     because local variables have to be right in the  struct buffer.
+     So we copy it around in set_buffer_internal.
+     This comes before `name' because it is marked in a special way.  */
+  Lisp_Object undo_list;
-
-  /* Analogous to mode_line_format for the line displayed at the top