diff options
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 9 | ||||
| -rw-r--r-- | lispref/processes.texi | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 5ebee61ecf2..ba206646a4b 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2007-05-06 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * processes.texi (Accepting Output): Revert most of previous change. | ||
| 4 | |||
| 5 | 2007-05-05 Richard Stallman <rms@gnu.org> | ||
| 6 | |||
| 7 | * processes.texi (Accepting Output): accept-process-output | ||
| 8 | uses microseconds, not milliseconds. But that arg is obsolete. | ||
| 9 | |||
| 1 | 2007-05-04 Karl Berry <karl@tug.org> | 10 | 2007-05-04 Karl Berry <karl@tug.org> |
| 2 | 11 | ||
| 3 | * elisp.texi (EMACSVER) [smallbook]: 22.1, not 22. | 12 | * elisp.texi (EMACSVER) [smallbook]: 22.1, not 22. |
diff --git a/lispref/processes.texi b/lispref/processes.texi index fbc8b785c11..81cac3e5046 100644 --- a/lispref/processes.texi +++ b/lispref/processes.texi | |||
| @@ -1307,13 +1307,13 @@ The arguments @var{seconds} and @var{millisec} let you specify timeout | |||
| 1307 | periods. The former specifies a period measured in seconds and the | 1307 | periods. The former specifies a period measured in seconds and the |
| 1308 | latter specifies one measured in milliseconds. The two time periods | 1308 | latter specifies one measured in milliseconds. The two time periods |
| 1309 | thus specified are added together, and @code{accept-process-output} | 1309 | thus specified are added together, and @code{accept-process-output} |
| 1310 | returns after that much time whether or not there has been any | 1310 | returns after that much time, whether or not there has been any |
| 1311 | subprocess output. | 1311 | subprocess output. |
| 1312 | 1312 | ||
| 1313 | The argument @var{seconds} need not be an integer. If it is a floating | 1313 | The argument @var{millisec} is semi-obsolete nowadays because |
| 1314 | point number, this function waits for a fractional number of seconds. | 1314 | @var{seconds} can be a floating point number to specify waiting a |
| 1315 | If @var{seconds} is 0, the function accepts whatever output is | 1315 | fractional number of seconds. If @var{seconds} is 0, the function |
| 1316 | pending but does not wait. | 1316 | accepts whatever output is pending but does not wait. |
| 1317 | 1317 | ||
| 1318 | @c Emacs 22.1 feature | 1318 | @c Emacs 22.1 feature |
| 1319 | If @var{process} is a process, and the argument @var{just-this-one} is | 1319 | If @var{process} is a process, and the argument @var{just-this-one} is |