2 files changed, 12 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e1f5be9c0cf..9c8893fdcdc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2007-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * buffer.h (struct buffer): Move `undo_list' back to before `name'.
+        This undoes Richard's change of 14-Oct-2002.
+
         * alloc.c (allocate_other_vector):
         * lisp.h (allocate_other_vector): Remove.
 
diff --git a/src/buffer.h b/src/buffer.h
index 3d34e7c3217..37f499f0351 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -552,6 +552,15 @@ struct buffer
   /* Position where the overlay lists are centered.  */
   EMACS_INT overlay_center;
 
+  /* 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;
+
   /* Everything from here down must be a Lisp_Object.  */
 
   /* The name of this buffer.  */
@@ -592,15 +601,6 @@ struct buffer
   /* 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
      of windows.  Nil means don't display that line.  */
   Lisp_Object header_line_format;