diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 2 |
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 @@ +2010-09-17 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * process.c (wait_reading_process_output): Don't message about + accept-process-output unless the time limit really is zero. + 2010-09-17 Stefan Monnier <monnier@iro.umontreal.ca> * 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, FD_ZERO (&Connecting); #endif - if (time_limit == 0 && wait_proc && !NILP (Vinhibit_quit) + if (time_limit == 0 && microsecs == 0 && wait_proc && !NILP (Vinhibit_quit) && !(CONSP (wait_proc->status) && EQ (XCAR (wait_proc->status), Qexit))) message ("Blocking call to accept-process-output with quit inhibited!!"); |