Index: src/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.5658
diff -u -r1.5658 ChangeLog
--- src/ChangeLog	1 May 2007 08:15:56 -0000	1.5658
+++ src/ChangeLog	3 May 2007 12:40:24 -0000
@@ -1,3 +1,10 @@
+2007-05-03  Per Cederqvist  <ceder@lysator.liu.se>
+
+	* process.c (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.
+
 2007-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macmenu.c (mac_dialog_show): Apply 2007-04-27 change for xmenu.c.
Index: src/process.c
===================================================================
RCS file: /sources/emacs/emacs/src/process.c,v
retrieving revision 1.512
diff -u -r1.512 process.c
--- src/process.c	23 Apr 2007 21:27:40 -0000	1.512
+++ src/process.c	3 May 2007 12:40:25 -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)