(M-16326'): Add Mojikyo-050239.

[chise/xemacs-chise.git] / src / bufslots.h

diff --git a/src/bufslots.h b/src/bufslots.h
index 000a943..660127b 100644 (file)
--- a/src/bufslots.h
+++ b/src/bufslots.h
@@ -32,6 +32,10 @@ Boston, MA 02111-1307, USA.  */
    definition.  In the garbage collector this file is included after
    defining MARKED_SLOT(x) to be mark_object(buffer->x). */
 
+#ifndef BUFFER_SLOTS_FIRST_NAME
+#define BUFFER_SLOTS_FIRST_NAME name
+#endif
+
     /* The name of this buffer.  */
     MARKED_SLOT (name);
 
@@ -69,7 +73,7 @@ Boston, MA 02111-1307, USA.  */
        Specifically, this lists those variables that have
        a buffer-local value in this buffer: i.e. those
        whose value does not shadow the default value.
-       (Remember that for any particlar variable created
+       (Remember that for any particular variable created
        with `make-local-variable' or `make-variable-buffer-local',
        it will have a per-buffer value in some buffers and a
        default value in others.)
@@ -185,9 +189,7 @@ Boston, MA 02111-1307, USA.  */
     /* FSFmacs has overlay stuff here.  We have extent info elsewhere in the
        struct buffer.  */
 
-    /* If dedicated_frame is non-nil, display_buffer tries to use it instead
-       of the current frame */
-    MARKED_SLOT (dedicated_frame);
+    /* dedicated_frame in lisp */
 
     /* Lisp of symbols naming the file format used for visited file. */
     MARKED_SLOT (file_format);
@@ -235,13 +237,14 @@ Boston, MA 02111-1307, USA.  */
     /* A hash table that maps from a "generic extent" (an extent in
        `modeline-format') into a buffer-specific extent. */
     MARKED_SLOT (modeline_extent_table);
+
+#ifndef BUFFER_SLOTS_LAST_NAME
+#define BUFFER_SLOTS_LAST_NAME modeline_extent_table
+#endif
+
 #if 0 /* FSFmacs */
     /* This is silly and stupid */
     /* These are so we don't have to recompile everything
        the next few times we add a new slot.  */
     MARKED_SLOT (extra1, extra2, extra3);
 #endif
-  /* The cache of positions for whilch line number has last been
-     calculated.  See line-number.c. */
-    MARKED_SLOT (line_number_cache);
-