diff options
author | Richard M. Stallman <[email protected]> | 2007-05-05 04:02:09 +0000 |
---|---|---|
committer | Richard M. Stallman <[email protected]> | 2007-05-05 04:02:09 +0000 |
commit | 55da0626a4bb1ec47daf673e00caeb4c98409e22 (patch) | |
tree | e6eb572dd5a76b4a30ec0f37ba64ddb2ffc7de80 | |
parent | 2511170598c70994042e68108481a8f5792e5f96 (diff) |
(Faccept_process_output): Revert 2006-03-22 change so
that the third argument once again is in microseconds (not
milliseconds). This makes it compatible with Emacs 21 and
earlier. Problem found by Henrik Rindlöw.
-rw-r--r-- | src/process.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/process.c b/src/process.c index a129195b41..5452055ff7 100644 --- a/src/process.c +++ b/src/process.c @@ -3912,8 +3912,8 @@ It is read into the process' buffers or given to their filter functions. Non-nil arg PROCESS means do not return until some output has been received from PROCESS. -Non-nil second arg SECONDS and third arg MILLISEC are number of -seconds and milliseconds to wait; return after that much time whether +Non-nil second arg SECONDS and third arg MICROSEC are number of +seconds and microseconds to wait; return after that much time whether or not there is input. If SECONDS is a floating point number, it specifies a fractional number of seconds to wait. @@ -3921,8 +3921,8 @@ If optional fourth arg JUST-THIS-ONE is non-nil, only accept output from PROCESS, suspending reading output from other processes. If JUST-THIS-ONE is an integer, don't run any timers either. Return non-nil iff we received any output before the timeout expired. */) - (process, seconds, millisec, just_this_one) - register Lisp_Object process, seconds, millisec, just_this_one; + (process, seconds, microsec, just_this_one) + register Lisp_Object process, seconds, microsec, just_this_one; { int secs, usecs = 0; @@ -3944,10 +3944,10 @@ Return non-nil iff we received any output before the timeout expired. */) else wrong_type_argument (Qnumberp, seconds); - if (INTEGERP (millisec)) + if (INTEGERP (microsec)) { int carry; - usecs += XINT (millisec) * 1000; + usecs += XINT (microsec); carry = usecs / 1000000; secs += carry; if ((usecs -= carry * 1000000) < 0) |