diff options
| author | Lars Magne Ingebrigtsen <[email protected]> | 2010-09-17 17:47:49 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <[email protected]> | 2010-09-17 17:47:49 +0200 |
| commit | 283357a76d2f44c6899ea0456d5b8b97ece2055e (patch) | |
| tree | ab9b322b3bd11cb9ebf6bf13e2a2a4c72f3d2164 | |
| parent | 4ddb20d610fe36cca1ca8d67dd2b1e2dc9b4d5a9 (diff) | |
* process.c (wait_reading_process_output): Don't message about
accept-process-output unless the time limit really is zero.
| -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 2074205d38..282394e141 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-09-17 Lars Magne Ingebrigtsen <[email protected]> + + * 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 <[email protected]> * frame.c (Ftool_bar_pixel_width): YAILOM (Yet another diff --git a/src/process.c b/src/process.c index f348dca7d3..ec1b9586db 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!!"); |