diff options
| author | Glenn Morris | 2018-12-30 16:57:36 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-12-30 16:57:36 -0800 |
| commit | a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b (patch) | |
| tree | 38752101a9dcceb10009f017bced8e0a213e21ed /doc | |
| parent | 83bbb48142e5f9714408dd628d244678eff2dc11 (diff) | |
| parent | 3abebeb8c3047092763f2d4a61fe7dfc659cd1bf (diff) | |
| download | emacs-a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b.tar.gz emacs-a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b.zip | |
Merge from origin/emacs-26
3abebeb * lisp/files.el (cd): Fix last change. (Bug#33791)
7a60a4f Fix remote directories in Eshell on MS-Windows
822a2d0 Fix :type 'group' in defcustom
a731c56 Fix NS fringe bitmap drawing bug (bug#33864)
0c52459 Fix commentary in dispnew.c
c9fdd1b Improve accept-process-process doc
9578c2a Fix a simple bug in display-buffer-use-some-frame
0f9be72 Clarify thread switching while waiting for process output
24ddea0 Improve process doc. with respect to handling of large input ...
2931016 ; Cosmetic changes in etc/NEWS
85516b8 Minor copyedits in landmark.el
# Conflicts:
# etc/NEWS
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/processes.texi | 14 | ||||
| -rw-r--r-- | doc/lispref/threads.texi | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index c6ffb2815e0..88b0382b7d1 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -612,10 +612,9 @@ these features. However, for subprocesses used by Lisp programs for | |||
| 612 | internal purposes (i.e., no user interaction with the subprocess is | 612 | internal purposes (i.e., no user interaction with the subprocess is |
| 613 | required), where significant amounts of data need to be exchanged | 613 | required), where significant amounts of data need to be exchanged |
| 614 | between the subprocess and the Lisp program, it is often better to use | 614 | between the subprocess and the Lisp program, it is often better to use |
| 615 | a pipe, because pipes are more efficient, and because they are immune | 615 | a pipe, because pipes are more efficient. Also, the total number of |
| 616 | to stray character injections that ptys introduce for large (around | 616 | ptys is limited on many systems, and it is good not to waste them |
| 617 | 500 byte) messages. Also, the total number of ptys is limited on many | 617 | unnecessarily. |
| 618 | systems, and it is good not to waste them unnecessarily. | ||
| 619 | 618 | ||
| 620 | @defun make-process &rest args | 619 | @defun make-process &rest args |
| 621 | This function is the basic low-level primitive for starting | 620 | This function is the basic low-level primitive for starting |
| @@ -1821,7 +1820,8 @@ until output arrives from a process. | |||
| 1821 | This function allows Emacs to read pending output from processes. The | 1820 | This function allows Emacs to read pending output from processes. The |
| 1822 | output is given to their filter functions. If @var{process} is | 1821 | output is given to their filter functions. If @var{process} is |
| 1823 | non-@code{nil} then this function does not return until some output | 1822 | non-@code{nil} then this function does not return until some output |
| 1824 | has been received from @var{process}. | 1823 | has been received from @var{process} or @var{process} has closed the |
| 1824 | connection. | ||
| 1825 | 1825 | ||
| 1826 | The arguments @var{seconds} and @var{millisec} let you specify timeout | 1826 | The arguments @var{seconds} and @var{millisec} let you specify timeout |
| 1827 | periods. The former specifies a period measured in seconds and the | 1827 | periods. The former specifies a period measured in seconds and the |
| @@ -1846,7 +1846,9 @@ speech synthesis. | |||
| 1846 | 1846 | ||
| 1847 | The function @code{accept-process-output} returns non-@code{nil} if it | 1847 | The function @code{accept-process-output} returns non-@code{nil} if it |
| 1848 | got output from @var{process}, or from any process if @var{process} is | 1848 | got output from @var{process}, or from any process if @var{process} is |
| 1849 | @code{nil}. It returns @code{nil} if the timeout expired before output | 1849 | @code{nil}; this can occur even after a process has exited if the |
| 1850 | corresponding connection contains buffered data. The function returns | ||
| 1851 | @code{nil} if the timeout expired or the connection was closed before output | ||
| 1850 | arrived. | 1852 | arrived. |
| 1851 | @end defun | 1853 | @end defun |
| 1852 | 1854 | ||
diff --git a/doc/lispref/threads.texi b/doc/lispref/threads.texi index c9d5f790485..d5d3b4243a6 100644 --- a/doc/lispref/threads.texi +++ b/doc/lispref/threads.texi | |||
| @@ -17,9 +17,9 @@ correct programs should not rely on cooperative threading. | |||
| 17 | 17 | ||
| 18 | Currently, thread switching will occur upon explicit request via | 18 | Currently, thread switching will occur upon explicit request via |
| 19 | @code{thread-yield}, when waiting for keyboard input or for process | 19 | @code{thread-yield}, when waiting for keyboard input or for process |
| 20 | output (e.g., during @code{accept-process-output}), or during blocking | 20 | output from asynchronous processes (e.g., during |
| 21 | operations relating to threads, such as mutex locking or | 21 | @code{accept-process-output}), or during blocking operations relating |
| 22 | @code{thread-join}. | 22 | to threads, such as mutex locking or @code{thread-join}. |
| 23 | 23 | ||
| 24 | Emacs Lisp provides primitives to create and control threads, and | 24 | Emacs Lisp provides primitives to create and control threads, and |
| 25 | also to create and control mutexes and condition variables, useful for | 25 | also to create and control mutexes and condition variables, useful for |