[Emacs-diffs] Changes to emacs/src/process.c,v [EMACS_22_BASE]

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Richard M. Stallman <rms>       07/05/06 17:39:54

Index: process.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/process.c,v
retrieving revision 1.512.2.1
retrieving revision 1.512.2.2
diff -u -b -r1.512.2.1 -r1.512.2.2
--- process.c   5 May 2007 04:02:09 -0000       1.512.2.1
+++ process.c   6 May 2007 17:39:53 -0000       1.512.2.2
@@ -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 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 @@
 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 @@
       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)