diff options
| -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 @@ | |||
| 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 | ||
| 7 | 2012-04-15 Glenn Morris <rgm@gnu.org> | 8 | 2012-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 | |||
| 1465 | functions. If @var{process} is non-@code{nil} then this function does | 1465 | functions. If @var{process} is non-@code{nil} then this function does |
| 1466 | not return until some output has been received from @var{process}. | 1466 | not return until some output has been received from @var{process}. |
| 1467 | 1467 | ||
| 1468 | @c Emacs 19 feature | ||
| 1469 | The arguments @var{seconds} and @var{millisec} let you specify timeout | 1468 | The arguments @var{seconds} and @var{millisec} let you specify timeout |
| 1470 | periods. The former specifies a period measured in seconds and the | 1469 | periods. The former specifies a period measured in seconds and the |
| 1471 | latter specifies one measured in milliseconds. The two time periods | 1470 | latter specifies one measured in milliseconds. The two time periods |
| @@ -1473,10 +1472,10 @@ thus specified are added together, and @code{accept-process-output} | |||
| 1473 | returns after that much time, whether or not there has been any | 1472 | returns after that much time, whether or not there has been any |
| 1474 | subprocess output. | 1473 | subprocess output. |
| 1475 | 1474 | ||
| 1476 | The argument @var{millisec} is semi-obsolete nowadays because | 1475 | The argument @var{millisec} is obsolete (and should not be used), |
| 1477 | @var{seconds} can be a floating point number to specify waiting a | 1476 | because @var{seconds} can be a floating point number to specify |
| 1478 | fractional number of seconds. If @var{seconds} is 0, the function | 1477 | waiting a fractional number of seconds. If @var{seconds} is 0, the |
| 1479 | accepts whatever output is pending but does not wait. | 1478 | function accepts whatever output is pending but does not wait. |
| 1480 | 1479 | ||
| 1481 | @c Emacs 22.1 feature | 1480 | @c Emacs 22.1 feature |
| 1482 | If @var{process} is a process, and the argument @var{just-this-one} is | 1481 | If @var{process} is a process, and the argument @var{just-this-one} is |