aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-15 17:55:06 -0700
committerGlenn Morris2012-04-15 17:55:06 -0700
commit4f5d565ff35cd843ffed06e02e4c5642433124cb (patch)
treef2a99bfd2cfeb9a35e60050d90362dfd2ca87955
parent62f4b18cfdff92ba9cc335a35e7103f553abda0c (diff)
downloademacs-4f5d565ff35cd843ffed06e02e4c5642433124cb.tar.gz
emacs-4f5d565ff35cd843ffed06e02e4c5642433124cb.zip
* processes.texi (Accepting Output): Discourage use of `millisec' argument.
-rw-r--r--doc/lispref/ChangeLog1
-rw-r--r--doc/lispref/processes.texi9
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 @@
3 * processes.texi (Process Information, Input to Processes) 3 * processes.texi (Process Information, Input to Processes)
4 (Signals to Processes, Output from Processes, Process Buffers) 4 (Signals to Processes, Output from Processes, Process Buffers)
5 (Filter Functions, Decoding Output): Copyedits. 5 (Filter Functions, Decoding Output): Copyedits.
6 (Accepting Output): Discourage use of `millisec' argument.
6 7
72012-04-15 Glenn Morris <rgm@gnu.org> 82012-04-15 Glenn Morris <rgm@gnu.org>
8 9
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
1465functions. If @var{process} is non-@code{nil} then this function does 1465functions. If @var{process} is non-@code{nil} then this function does
1466not return until some output has been received from @var{process}. 1466not return until some output has been received from @var{process}.
1467 1467
1468@c Emacs 19 feature
1469The arguments @var{seconds} and @var{millisec} let you specify timeout 1468The arguments @var{seconds} and @var{millisec} let you specify timeout
1470periods. The former specifies a period measured in seconds and the 1469periods. The former specifies a period measured in seconds and the
1471latter specifies one measured in milliseconds. The two time periods 1470latter specifies one measured in milliseconds. The two time periods
@@ -1473,10 +1472,10 @@ thus specified are added together, and @code{accept-process-output}
1473returns after that much time, whether or not there has been any 1472returns after that much time, whether or not there has been any
1474subprocess output. 1473subprocess output.
1475 1474
1476The argument @var{millisec} is semi-obsolete nowadays because 1475The argument @var{millisec} is obsolete (and should not be used),
1477@var{seconds} can be a floating point number to specify waiting a 1476because @var{seconds} can be a floating point number to specify
1478fractional number of seconds. If @var{seconds} is 0, the function 1477waiting a fractional number of seconds. If @var{seconds} is 0, the
1479accepts whatever output is pending but does not wait. 1478function accepts whatever output is pending but does not wait.
1480 1479
1481@c Emacs 22.1 feature 1480@c Emacs 22.1 feature
1482If @var{process} is a process, and the argument @var{just-this-one} is 1481If @var{process} is a process, and the argument @var{just-this-one} is