From 64b6dd61336602e6b85ed5536ca95627cc0d7030 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 6 May 2007 17:39:53 +0000 Subject: [PATCH] Undo May 3 change. --- src/process.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/process.c b/src/process.c index 5452055ff7e..a129195b415 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 MICROSEC are number of -seconds and microseconds to wait; return after that much time whether +Non-nil second arg SECONDS and third arg MILLISEC are number of +seconds and milliseconds 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, microsec, just_this_one) - register Lisp_Object process, seconds, microsec, just_this_one; + (process, seconds, millisec, just_this_one) + register Lisp_Object process, seconds, millisec, 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 (microsec)) + if (INTEGERP (millisec)) { int carry; - usecs += XINT (microsec); + usecs += XINT (millisec) * 1000; carry = usecs / 1000000; secs += carry; if ((usecs -= carry * 1000000) < 0) -- 2.39.2