diff options
author | Paul Eggert <[email protected]> | 2014-06-09 13:31:06 -0700 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2014-06-09 13:31:06 -0700 |
commit | feb6546cdf5b43f8e50aaaabb29c6856a9251893 (patch) | |
tree | 60ecc4775ad2202b402cfe7e28f1f27d07d30331 /doc | |
parent | 2c70e6b00aec31c455eee2a939863a4e382986fc (diff) |
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 93128962c3..d859e0f01a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2014-06-09 Paul Eggert <[email protected]> + + Say (accept-process-output P)'s result pertains to P if P is non-nil. + * processes.texi (Accepting Output): Mention that if PROCESS is non-nil, + the return value is about PROCESS, not about other processes. + 2014-06-08 Glenn Morris <[email protected]> * os.texi (Startup Summary): Small fix for initial-buffer-choice. diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index c91afdffde..db80f0537e 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 periods. The former specifies a period measured in seconds and the latter specifies one measured in milliseconds. The two time periods thus specified are added together, and @code{accept-process-output} -returns after that much time, whether or not there has been any +returns after that much time, even if there is no subprocess output. 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 speech synthesis. The function @code{accept-process-output} returns non-@code{nil} if it -did get some output, or @code{nil} if the timeout expired before output +got output from @var{process}, or from any process if @var{process} is +@code{nil}. It returns @code{nil} if the timeout expired before output arrived. @end defun |