aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-09-17 17:47:49 +0200
committerLars Magne Ingebrigtsen2010-09-17 17:47:49 +0200
commit283357a76d2f44c6899ea0456d5b8b97ece2055e (patch)
treeab9b322b3bd11cb9ebf6bf13e2a2a4c72f3d2164 /src
parent4ddb20d610fe36cca1ca8d67dd2b1e2dc9b4d5a9 (diff)
downloademacs-283357a76d2f44c6899ea0456d5b8b97ece2055e.tar.gz
emacs-283357a76d2f44c6899ea0456d5b8b97ece2055e.zip
* process.c (wait_reading_process_output): Don't message about
accept-process-output unless the time limit really is zero.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2074205d38a..282394e1414 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-09-17 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * process.c (wait_reading_process_output): Don't message about
4 accept-process-output unless the time limit really is zero.
5
12010-09-17 Stefan Monnier <monnier@iro.umontreal.ca> 62010-09-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * frame.c (Ftool_bar_pixel_width): YAILOM (Yet another 8 * frame.c (Ftool_bar_pixel_width): YAILOM (Yet another
diff --git a/src/process.c b/src/process.c
index f348dca7d35..ec1b9586db5 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4403,7 +4403,7 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
4403 FD_ZERO (&Connecting); 4403 FD_ZERO (&Connecting);
4404#endif 4404#endif
4405 4405
4406 if (time_limit == 0 && wait_proc && !NILP (Vinhibit_quit) 4406 if (time_limit == 0 && microsecs == 0 && wait_proc && !NILP (Vinhibit_quit)
4407 && !(CONSP (wait_proc->status) && EQ (XCAR (wait_proc->status), Qexit))) 4407 && !(CONSP (wait_proc->status) && EQ (XCAR (wait_proc->status), Qexit)))
4408 message ("Blocking call to accept-process-output with quit inhibited!!"); 4408 message ("Blocking call to accept-process-output with quit inhibited!!");
4409 4409