--- a/src/insdel.c	Mon Aug 13 08:55:32 2007 +0200
+++ b/src/insdel.c	Mon Aug 13 08:56:04 2007 +0200
@@ -1219,7 +1219,7 @@
 {
   /* This function can GC */
   Lisp_Object buffer;
-  XSETBUFFER (buffer, buf);
+  XSETBUFFER (buffer, current_buffer);
 
   if (!in_first_change)
     {
@@ -1281,6 +1281,7 @@
       /* Now in any case run the before-change-functions if any.  */
 
       if (!preparing_for_armageddon &&
+	  !EQ (buffer, Vprin1_to_string_buffer) &&
 	  (!NILP (symbol_value_in_buffer (Qbefore_change_functions, buffer)) ||
 	   /* Obsolete, for compatibility */
 	   !NILP (symbol_value_in_buffer (Qbefore_change_function, buffer))))
@@ -1339,6 +1340,7 @@
 	}
 
       if (!preparing_for_armageddon &&
+	  !EQ (buffer, Vprin1_to_string_buffer) &&
 	  (!NILP (symbol_value_in_buffer (Qafter_change_functions, buffer)) ||
 	   /* Obsolete, for compatibility */
 	   !NILP (symbol_value_in_buffer (Qafter_change_function, buffer))))