diff options
author | Glenn Morris <rgm@gnu.org> | 2012-04-15 17:55:06 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2012-04-15 17:55:06 -0700 |
commit | 4f5d565ff35cd843ffed06e02e4c5642433124cb (patch) | |
tree | f2a99bfd2cfeb9a35e60050d90362dfd2ca87955 | |
parent | 62f4b18cfdff92ba9cc335a35e7103f553abda0c (diff) | |
download | emacs-4f5d565ff35cd843ffed06e02e4c5642433124cb.tar.gz |
* processes.texi (Accepting Output): Discourage use of `millisec' argument.
-rw-r--r-- | doc/lispref/ChangeLog | 1 | ||||
-rw-r--r-- | doc/lispref/processes.texi | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 3335e8a5c0c..d20c4d19c3a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -3,6 +3,7 @@ * processes.texi (Process Information, Input to Processes) (Signals to Processes, Output from Processes, Process Buffers) (Filter Functions, Decoding Output): Copyedits. + (Accepting Output): Discourage use of `millisec' argument. 2012-04-15 Glenn Morris <rgm@gnu.org> diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 94730a24df5..fd8bc717d09 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1465,7 +1465,6 @@ 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{millisec} let you specify timeout periods. The former specifies a period measured in seconds and the latter specifies one measured in milliseconds. The two time periods @@ -1473,10 +1472,10 @@ 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{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. +The argument @var{millisec} is obsolete (and should not be used), +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. @c Emacs 22.1 feature If @var{process} is a process, and the argument @var{just-this-one} is |