From 55da0626a4bb1ec47daf673e00caeb4c98409e22 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 5 May 2007 04:02:09 +0000 Subject: [PATCH] =?utf8?q?(Faccept=5Fprocess=5Foutput):=20Revert=202006-03?= =?utf8?q?-22=20change=20so=20that=20the=20third=20argument=20once=20again?= =?utf8?q?=20is=20in=20microseconds=20(not=20milliseconds).=20=20This=20ma?= =?utf8?q?kes=20it=20compatible=20with=20Emacs=2021=20and=20earlier.=20=20?= =?utf8?q?Problem=20found=20by=20Henrik=20Rindl=C3=B6w.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/process.c | 12 ++++++------ 1 file 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. 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) -- 2.39.2