aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-05-06 17:44:41 +0000
committerRichard M. Stallman2007-05-06 17:44:41 +0000
commitfacc74f786206772329ddf7a1e2a97677863596e (patch)
treed5711d4c6ad874f413355afa96d2447f12402029
parent64b6dd61336602e6b85ed5536ca95627cc0d7030 (diff)
downloademacs-facc74f786206772329ddf7a1e2a97677863596e.tar.gz
emacs-facc74f786206772329ddf7a1e2a97677863596e.zip
(Accepting Output): Revert most of previous change.
-rw-r--r--lispref/processes.texi10
1 files changed, 5 insertions, 5 deletions
diff --git a/lispref/processes.texi b/lispref/processes.texi
index 909f5507790..81cac3e5046 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
1296explicitly permit output to arrive at a specific point, or even to wait 1296explicitly permit output to arrive at a specific point, or even to wait
1297until output arrives from a process. 1297until output arrives from a process.
1298 1298
1299@defun accept-process-output &optional process seconds microsec just-this-one 1299@defun accept-process-output &optional process seconds millisec just-this-one
1300This function allows Emacs to read pending output from processes. The 1300This function allows Emacs to read pending output from processes. The
1301output is inserted in the associated buffers or given to their filter 1301output is inserted in the associated buffers or given to their filter
1302functions. If @var{process} is non-@code{nil} then this function does 1302functions. If @var{process} is non-@code{nil} then this function does
1303not return until some output has been received from @var{process}. 1303not return until some output has been received from @var{process}.
1304 1304
1305@c Emacs 19 feature 1305@c Emacs 19 feature
1306The arguments @var{seconds} and @var{microsec} let you specify timeout 1306The arguments @var{seconds} and @var{millisec} let you specify timeout
1307periods. The former specifies a period measured in seconds and the 1307periods. The former specifies a period measured in seconds and the
1308latter specifies one measured in microseconds. The two time periods 1308latter specifies one measured in milliseconds. The two time periods
1309thus specified are added together, and @code{accept-process-output} 1309thus specified are added together, and @code{accept-process-output}
1310returns after that much time, whether or not there has been any 1310returns after that much time, whether or not there has been any
1311subprocess output. 1311subprocess output.
1312 1312
1313The argument @var{microsec} is semi-obsolete nowadays because 1313The argument @var{millisec} is semi-obsolete nowadays because
1314@var{seconds} can be a floating point number to specify waiting a 1314@var{seconds} can be a floating point number to specify waiting a
1315fractional number of seconds. If @var{seconds} is 0, the function 1315fractional number of seconds. If @var{seconds} is 0, the function
1316accepts whatever output is pending but does not wait. 1316accepts whatever output is pending but does not wait.