diff options
| author | Paul Eggert | 2014-06-09 13:31:06 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-06-09 13:31:06 -0700 |
| commit | feb6546cdf5b43f8e50aaaabb29c6856a9251893 (patch) | |
| tree | 60ecc4775ad2202b402cfe7e28f1f27d07d30331 /doc | |
| parent | 2c70e6b00aec31c455eee2a939863a4e382986fc (diff) | |
| download | emacs-feb6546cdf5b43f8e50aaaabb29c6856a9251893.tar.gz emacs-feb6546cdf5b43f8e50aaaabb29c6856a9251893.zip | |
Say (accept-process-output P)'s result pertains to P if P is non-nil.
* doc/lispref/processes.texi (Accepting Output):
* src/process.c (Faccept_process_output)
(wait_reading_process_output): Mention that if PROCESS is non-nil,
the return value is about PROCESS, not about other processes.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/processes.texi | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 93128962c33..d859e0f01a9 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-06-09 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Say (accept-process-output P)'s result pertains to P if P is non-nil. | ||
| 4 | * processes.texi (Accepting Output): Mention that if PROCESS is non-nil, | ||
| 5 | the return value is about PROCESS, not about other processes. | ||
| 6 | |||
| 1 | 2014-06-08 Glenn Morris <rgm@gnu.org> | 7 | 2014-06-08 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * os.texi (Startup Summary): Small fix for initial-buffer-choice. | 9 | * os.texi (Startup Summary): Small fix for initial-buffer-choice. |
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index c91afdffdeb..db80f0537e0 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -1484,7 +1484,7 @@ The arguments @var{seconds} and @var{millisec} let you specify timeout | |||
| 1484 | periods. The former specifies a period measured in seconds and the | 1484 | periods. The former specifies a period measured in seconds and the |
| 1485 | latter specifies one measured in milliseconds. The two time periods | 1485 | latter specifies one measured in milliseconds. The two time periods |
| 1486 | thus specified are added together, and @code{accept-process-output} | 1486 | thus specified are added together, and @code{accept-process-output} |
| 1487 | returns after that much time, whether or not there has been any | 1487 | returns after that much time, even if there is no |
| 1488 | subprocess output. | 1488 | subprocess output. |
| 1489 | 1489 | ||
| 1490 | The argument @var{millisec} is obsolete (and should not be used), | 1490 | The argument @var{millisec} is obsolete (and should not be used), |
| @@ -1502,7 +1502,8 @@ recommended, but may be necessary for specific applications, such as | |||
| 1502 | speech synthesis. | 1502 | speech synthesis. |
| 1503 | 1503 | ||
| 1504 | The function @code{accept-process-output} returns non-@code{nil} if it | 1504 | The function @code{accept-process-output} returns non-@code{nil} if it |
| 1505 | did get some output, or @code{nil} if the timeout expired before output | 1505 | got output from @var{process}, or from any process if @var{process} is |
| 1506 | @code{nil}. It returns @code{nil} if the timeout expired before output | ||
| 1506 | arrived. | 1507 | arrived. |
| 1507 | @end defun | 1508 | @end defun |
| 1508 | 1509 | ||