From: Richard M. Stallman Date: Sun, 6 May 2007 17:44:41 +0000 (+0000) Subject: (Accepting Output): Revert most of previous change. X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/facc74f786206772329ddf7a1e2a97677863596e?hp=64b6dd61336602e6b85ed5536ca95627cc0d7030 (Accepting Output): Revert most of previous change. --- diff --git a/lispref/processes.texi b/lispref/processes.texi index 909f550779..81cac3e504 100644 --- a/lispref/processes.texi +++ b/lispref/processes.texi @@ -1296,21 +1296,21 @@ or terminal input. Occasionally it is useful in a Lisp program to explicitly permit output to arrive at a specific point, or even to wait until output arrives from a process. -@defun accept-process-output &optional process seconds microsec just-this-one +@defun accept-process-output &optional process seconds millisec just-this-one This function allows Emacs to read pending output from processes. The output is inserted in the associated buffers or given to their filter functions. If @var{process} is non-@code{nil} then this function does not return until some output has been received from @var{process}. @c Emacs 19 feature -The arguments @var{seconds} and @var{microsec} let you specify timeout +The arguments @var{seconds} and @var{millisec} let you specify timeout periods. The former specifies a period measured in seconds and the -latter specifies one measured in microseconds. The two time periods +latter specifies one measured in milliseconds. The two time periods thus specified are added together, and @code{accept-process-output} returns after that much time, whether or not there has been any subprocess output. - -The argument @var{microsec} is semi-obsolete nowadays because + +The argument @var{millisec} is semi-obsolete nowadays because @var{seconds} can be a floating point number to specify waiting a fractional number of seconds. If @var{seconds} is 0, the function accepts whatever output is pending but does not wait.