diff --git a/src/ChangeLog b/src/ChangeLog
index 67be01f753b..0e66830d018 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-10  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (add_to_log): Do nothing if called asynchronously.
+
 2001-07-09  Gerd Moellmann  <gerd@gnu.org>
 
 	* sound.c (toplevel): Include <signal.h> and "syssignal.h".
diff --git a/src/xdisp.c b/src/xdisp.c
index fa775d87d1b..f0c919fecc0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5499,6 +5499,12 @@ add_to_log (format, arg1, arg2)
   int len;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
 
+  /* Do nothing if called asynchronously.  Inserting text into
+     a buffer may call after-change-functions and alike and
+     that would means running Lisp asynchronously.  */
+  if (handling_signal)
+    return;
+
   fmt = msg = Qnil;
   GCPRO4 (fmt, msg, arg1, arg2);