# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1178337729 0
# Node ID 73b045a7fa706740de2e767747ee3aa5719e9537
# Parent  6187b5730b6e7a5461c405b96cb80c7fa51e2bc3
(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.

diff -r 6187b5730b6e -r 73b045a7fa70 src/process.c
--- a/src/process.c	Fri May 04 17:09:11 2007 +0000
+++ b/src/process.c	Sat May 05 04:02:09 2007 +0000
@@ -3912,8 +3912,8 @@
 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 @@
 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 @@
       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)