--- a/src/undo.c	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/undo.c	Mon Aug 13 09:02:59 2007 +0200
@@ -206,23 +206,19 @@
 void
 record_extent (Lisp_Object extent, int attached)
 {
-  Lisp_Object obj = Fextent_object (extent);
+  Lisp_Object buffer = Fextent_object (extent);
+  struct buffer *b = XBUFFER (buffer); /* !!#### */
+  Lisp_Object token;
+
+  if (!undo_prelude (b, 1))
+    return;
 
-  if (BUFFERP (obj))
-    {
-      Lisp_Object token;
-      struct buffer *b = XBUFFER (obj);
-      if (!undo_prelude (b, 1))
-	return;
-      if (attached)
-	token = extent;
-      else
-	token = list3 (extent, Fextent_start_position (extent),
-		       Fextent_end_position (extent));
-      b->undo_list = Fcons (token, b->undo_list);
-    }
+  if (attached)
+    token = extent;
   else
-    return;
+    token = list3 (extent, Fextent_start_position (extent),
+		   Fextent_end_position (extent));
+  b->undo_list = Fcons (token, b->undo_list);
 }
 
 #if 0 /* FSFmacs */