diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-01-26 20:45:38 -0500 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-01-26 20:45:38 -0500 |
| commit | f5357b1ca4ae90e7ad6d8321884319cfdf828508 (patch) | |
| tree | 5706d28900dd4f7441bae1629242a2ca029d645b /src/process.c | |
| parent | c9a268552c8294bbca607da239528e6b89f8fb5b (diff) | |
| parent | 463f96b4813fb77d88a7b0fa93f94aa08d71689f (diff) | |
| download | emacs-f5357b1ca4ae90e7ad6d8321884319cfdf828508.tar.gz | |
Merge from emacs-26
463f96b481 * doc/lispref/searching.texi: Document regexp repetition l...
08a6195571 ; test/README: Document TEST_LOAD_EL parameter.
7bbea90b1a * src/syntax.c (char-syntax): Warn about ignoring text pro...
50fcbb5f61 ; * src/process.c (Fprocess_contact): Fix docstring typo.
81ae9c8c05 Load mm-util as needed for url-file and url-data (Bug#30258)
5a1ee67ae1 Another minor copyedit in the manual's "Scroll Bars"
226a651e9e Minor fix in documentation of 'equal'
b26786c8d9 * lisp/dired-x.el (dired-guess-shell-alist-user): Doc fix....
5699a824f0 Minor rewording in Emacs manual's "Help Mode" node
f35ff0156e Fixes for Emacs manual in frames.texi
6cd4e8dcc5 * doc/misc/cl.texi (Efficiency Concerns): Fix 2012-10-27 t...
1412cf3edd Fix a few issues with latest GTK scaling changes
59db8dca03 Use scaled coordinates when calling into GTK
2892f05792 Scale monitor dimensions obtained from GTK
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index daa0dc68ae6..ff3edbb11a0 100644 --- a/src/process.c +++ b/src/process.c @@ -1437,7 +1437,7 @@ optional KEY arg. If KEY is nil, value is a cons cell of the form connection; it is t for a pipe connection. If KEY is t, the complete contact information for the connection is returned, else the specific value for the keyword KEY is returned. See `make-network-process', -`make-serial-process', or `make pipe-process' for the list of keywords. +`make-serial-process', or `make-pipe-process' for the list of keywords. If PROCESS is a non-blocking network process that hasn't been fully set up yet, this function will block until socket setup has completed. */) (Lisp_Object process, Lisp_Object key) |