aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/process.c b/src/process.c
index a129195b415..5452055ff7e 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.
3912Non-nil arg PROCESS means do not return until some output has been received 3912Non-nil arg PROCESS means do not return until some output has been received
3913from PROCESS. 3913from PROCESS.
3914 3914
3915Non-nil second arg SECONDS and third arg MILLISEC are number of 3915Non-nil second arg SECONDS and third arg MICROSEC are number of
3916seconds and milliseconds to wait; return after that much time whether 3916seconds and microseconds to wait; return after that much time whether
3917or not there is input. If SECONDS is a floating point number, 3917or not there is input. If SECONDS is a floating point number,
3918it specifies a fractional number of seconds to wait. 3918it specifies a fractional number of seconds to wait.
3919 3919
@@ -3921,8 +3921,8 @@ If optional fourth arg JUST-THIS-ONE is non-nil, only accept output
3921from PROCESS, suspending reading output from other processes. 3921from PROCESS, suspending reading output from other processes.
3922If JUST-THIS-ONE is an integer, don't run any timers either. 3922If JUST-THIS-ONE is an integer, don't run any timers either.
3923Return non-nil iff we received any output before the timeout expired. */) 3923Return non-nil iff we received any output before the timeout expired. */)
3924 (process, seconds, millisec, just_this_one) 3924 (process, seconds, microsec, just_this_one)
3925 register Lisp_Object process, seconds, millisec, just_this_one; 3925 register Lisp_Object process, seconds, microsec, just_this_one;
3926{ 3926{
3927 int secs, usecs = 0; 3927 int secs, usecs = 0;
3928 3928
@@ -3944,10 +3944,10 @@ Return non-nil iff we received any output before the timeout expired. */)
3944 else 3944 else
3945 wrong_type_argument (Qnumberp, seconds); 3945 wrong_type_argument (Qnumberp, seconds);
3946 3946
3947 if (INTEGERP (millisec)) 3947 if (INTEGERP (microsec))
3948 { 3948 {
3949 int carry; 3949 int carry;
3950 usecs += XINT (millisec) * 1000; 3950 usecs += XINT (microsec);
3951 carry = usecs / 1000000; 3951 carry = usecs / 1000000;
3952 secs += carry; 3952 secs += carry;
3953 if ((usecs -= carry * 1000000) < 0) 3953 if ((usecs -= carry * 1000000) < 0)