# HG changeset patch # User Richard M. Stallman # Date 1178473481 0 # Node ID 61d6d08c1ecfddc1343111699ac1410389211ee2 # Parent dd2237126840f0f3d9470e33e8e7ca8bd38ab4ef (Accepting Output): Revert most of previous change. diff -r dd2237126840 -r 61d6d08c1ecf lispref/processes.texi --- a/lispref/processes.texi Sun May 06 17:39:53 2007 +0000 +++ b/lispref/processes.texi Sun May 06 17:44:41 2007 +0000 @@ -1296,21 +1296,21 @@ 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.