--- a/src/undo.c	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/undo.c	Mon Aug 13 11:13:30 2007 +0200
@@ -46,7 +46,7 @@
    which will be added to the list at the end of the command.
    This ensures we can't run out of space while trying to make
    an undo-boundary.  */
-Lisp_Object pending_boundary;
+static Lisp_Object pending_boundary;
 
 static void
 undo_boundary (struct buffer *b)
@@ -281,7 +281,7 @@
       && NILP (XCAR (next)))
     {
       /* Add in the space occupied by this element and its chain link.  */
-      size_so_far += sizeof (struct Lisp_Cons);
+      size_so_far += sizeof (Lisp_Cons);
 
       /* Advance to next element.  */
       prev = next;
@@ -294,12 +294,12 @@
       elt = XCAR (next);
 
       /* Add in the space occupied by this element and its chain link.  */
-      size_so_far += sizeof (struct Lisp_Cons);
+      size_so_far += sizeof (Lisp_Cons);
       if (CONSP (elt))
 	{
-	  size_so_far += sizeof (struct Lisp_Cons);
+	  size_so_far += sizeof (Lisp_Cons);
 	  if (STRINGP (XCAR (elt)))
-	    size_so_far += (sizeof (struct Lisp_String) - 1
+	    size_so_far += (sizeof (Lisp_String) - 1
 			    + XSTRING_LENGTH (XCAR (elt)));
 	}
 
@@ -329,12 +329,12 @@
 	}
 
       /* Add in the space occupied by this element and its chain link.  */
-      size_so_far += sizeof (struct Lisp_Cons);
+      size_so_far += sizeof (Lisp_Cons);
       if (CONSP (elt))
 	{
-	  size_so_far += sizeof (struct Lisp_Cons);
+	  size_so_far += sizeof (Lisp_Cons);
 	  if (STRINGP (XCAR (elt)))
-	    size_so_far += (sizeof (struct Lisp_String) - 1
+	    size_so_far += (sizeof (Lisp_String) - 1
                             + XSTRING_LENGTH (XCAR (elt)));
 	}
 
@@ -547,9 +547,16 @@
 }
 
 void
+reinit_vars_of_undo (void)
+{
+  inside_undo = 0;
+}
+
+void
 vars_of_undo (void)
 {
-  inside_undo = 0;
+  reinit_vars_of_undo ();
+
   pending_boundary = Qnil;
   staticpro (&pending_boundary);
   last_undo_buffer = Qnil;