[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117294: Say (accept-process-output P)'s result pert
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r117294: Say (accept-process-output P)'s result pertains to P if P is non-nil. |
Date: |
Mon, 09 Jun 2014 20:31:12 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117294
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-09 13:31:06 -0700
message:
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.
modified:
doc/lispref/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6155
doc/lispref/processes.texi
processes.texi-20091113204419-o5vbwnq5f7feedwu-6207
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/process.c process.c-20091113204419-o5vbwnq5f7feedwu-462
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2014-06-08 23:41:43 +0000
+++ b/doc/lispref/ChangeLog 2014-06-09 20:31:06 +0000
@@ -1,3 +1,9 @@
+2014-06-09 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
* os.texi (Startup Summary): Small fix for initial-buffer-choice.
=== modified file 'doc/lispref/processes.texi'
--- a/doc/lispref/processes.texi 2014-04-29 04:14:27 +0000
+++ b/doc/lispref/processes.texi 2014-06-09 20:31:06 +0000
@@ -1484,7 +1484,7 @@
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 @@
speech synthesis.
The function @code{accept-process-output} returns address@hidden 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
address@hidden It returns @code{nil} if the timeout expired before output
arrived.
@end defun
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-06-09 15:03:49 +0000
+++ b/src/ChangeLog 2014-06-09 20:31:06 +0000
@@ -1,3 +1,10 @@
+2014-06-09 Paul Eggert <address@hidden>
+
+ Say (accept-process-output P)'s result pertains to P if P is non-nil.
+ * 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.
+
2014-06-09 Dmitry Antipov <address@hidden>
Further adjustments to mark_object and friends.
=== modified file 'src/process.c'
--- a/src/process.c 2014-06-08 18:27:22 +0000
+++ b/src/process.c 2014-06-09 20:31:06 +0000
@@ -3921,19 +3921,20 @@
0, 4, 0,
doc: /* Allow any pending output from subprocesses to be read by Emacs.
It is given to their filter functions.
-Non-nil arg PROCESS means do not return until some output has been received
-from PROCESS.
+Optional argument PROCESS means do not return until output has been
+received from PROCESS.
-Non-nil second arg SECONDS and third arg MILLISEC are number of seconds
-and milliseconds to wait; return after that much time whether or not
-there is any subprocess output. If SECONDS is a floating point number,
+Optional second argument SECONDS and third argument MILLISEC
+specify a timeout; return after that much time even if there is
+no subprocess output. If SECONDS is a floating point number,
it specifies a fractional number of seconds to wait.
The MILLISEC argument is obsolete and should be avoided.
-If optional fourth arg JUST-THIS-ONE is non-nil, only accept output
-from PROCESS, suspending reading output from other processes.
+If optional fourth argument JUST-THIS-ONE is non-nil, accept output
+from PROCESS only, suspending reading output from other processes.
If JUST-THIS-ONE is an integer, don't run any timers either.
-Return non-nil if we received any output before the timeout expired. */)
+Return non-nil if we received any output from PROCESS (or, if PROCESS
+is nil, from any process) before the timeout expired. */)
(register Lisp_Object process, Lisp_Object seconds, Lisp_Object millisec,
Lisp_Object just_this_one)
{
intmax_t secs;
@@ -4255,16 +4256,14 @@
(and gobble terminal input into the buffer if any arrives).
If WAIT_PROC is specified, wait until something arrives from that
- process. The return value is true if we read some input from
- that process.
+ process.
If JUST_WAIT_PROC is nonzero, handle only output from WAIT_PROC
(suspending output from other processes). A negative value
means don't run any timers either.
- If WAIT_PROC is specified, then the function returns true if we
- received input from that process before the timeout elapsed.
- Otherwise, return true if we received input from any process. */
+ Return true if we received input from WAIT_PROC, or from any
+ process if WAIT_PROC is null. */
bool
wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117294: Say (accept-process-output P)'s result pertains to P if P is non-nil.,
Paul Eggert <=