Mercurial > emacs

changeset 77654:dd2237126840

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Undo May 3 change.
author Richard M. Stallman <rms@gnu.org>
date Sun, 06 May 2007 17:39:53 +0000
parents c4a5ad4ab8f7
children 61d6d08c1ecf
files src/process.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/process.c	Sat May 05 22:57:07 2007 +0000
+++ b/src/process.c	Sun May 06 17:39:53 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 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)