aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-07-10 10:44:40 +0000
committerGerd Moellmann2001-07-10 10:44:40 +0000
commitae794295d6620f70d6736393a3101a8dee3827aa (patch)
treec0d02696e1b7efcde42d9a739b8822ad7cf3a972 /src
parent8184a578cd126881e6002cdefef1dd541897b400 (diff)
downloademacs-ae794295d6620f70d6736393a3101a8dee3827aa.tar.gz
emacs-ae794295d6620f70d6736393a3101a8dee3827aa.zip
(add_to_log): Do nothing if called asynchronously.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 67be01f753b..0e66830d018 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12001-07-10 Gerd Moellmann <gerd@gnu.org>
2
3 * xdisp.c (add_to_log): Do nothing if called asynchronously.
4
12001-07-09 Gerd Moellmann <gerd@gnu.org> 52001-07-09 Gerd Moellmann <gerd@gnu.org>
2 6
3 * sound.c (toplevel): Include <signal.h> and "syssignal.h". 7 * 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)
5499 int len; 5499 int len;
5500 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; 5500 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
5501 5501
5502 /* Do nothing if called asynchronously. Inserting text into
5503 a buffer may call after-change-functions and alike and
5504 that would means running Lisp asynchronously. */
5505 if (handling_signal)
5506 return;
5507
5502 fmt = msg = Qnil; 5508 fmt = msg = Qnil;
5503 GCPRO4 (fmt, msg, arg1, arg2); 5509 GCPRO4 (fmt, msg, arg1, arg2);
5504 5510