diff options
| author | Glenn Morris | 2018-02-09 11:12:48 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-02-09 11:12:48 -0800 |
| commit | 875cb835f00260d58c536b3a3f7c0343fd5f28dc (patch) | |
| tree | 4f59af87328e8d4d69667b3b35c42f795e7d3d29 /src/process.c | |
| parent | 05e8b4392be7fb368dcf4e4a19f75f94b323028d (diff) | |
| parent | 0276743672672ce0caec7861741293a4ae11cb52 (diff) | |
| download | emacs-875cb835f00260d58c536b3a3f7c0343fd5f28dc.tar.gz emacs-875cb835f00260d58c536b3a3f7c0343fd5f28dc.zip | |
Merge from origin/emacs-26
0276743 (origin/emacs-26) Doc string fix in latin-alt.el
c9269af Minor improvements in package.texi
898a3e4 Minor improvement in Emacs user manual
8f7d718 * doc/lispref/anti.texi (Antinews): Replace 25.2 with 25.3.
989d0af Improve documentation of mini-window resizing
923e415 More changes in the Emacs manual
565adf2 Clarify that text-quoting-style doesn't affect *Info* (Bug#24...
2dd273b Mention that shell quoting of % on w32 may fail (Bug#19350)
19fa6d5 Fix --no-build-details for w32 and macOS
979944c * doc/lispref/anti.texi (Antinews): Add some more antinews.
c2727e3 Fix crashes when run with --no-build-details
dc08490 More changes for the manual
04c5bd5 Doc fixes for process functions (Bug#30349)
e209034 Fix shr and CSS 4 color maps
5fe8192 Yet another round of improvements in the manual
Conflicts:
doc/emacs/files.texi
test/lisp/subr-tests.el
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/process.c b/src/process.c index ff3edbb11a0..2cc2c86df39 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -1615,9 +1615,8 @@ to make it unique. | |||
| 1615 | 1615 | ||
| 1616 | :buffer BUFFER -- BUFFER is the buffer (or buffer-name) to associate | 1616 | :buffer BUFFER -- BUFFER is the buffer (or buffer-name) to associate |
| 1617 | with the process. Process output goes at end of that buffer, unless | 1617 | with the process. Process output goes at end of that buffer, unless |
| 1618 | you specify an output stream or filter function to handle the output. | 1618 | you specify a filter function to handle the output. BUFFER may be |
| 1619 | BUFFER may be also nil, meaning that this process is not associated | 1619 | also nil, meaning that this process is not associated with any buffer. |
| 1620 | with any buffer. | ||
| 1621 | 1620 | ||
| 1622 | :command COMMAND -- COMMAND is a list starting with the program file | 1621 | :command COMMAND -- COMMAND is a list starting with the program file |
| 1623 | name, followed by strings to give to the program as arguments. | 1622 | name, followed by strings to give to the program as arguments. |
| @@ -2307,8 +2306,8 @@ arguments are defined: | |||
| 2307 | 2306 | ||
| 2308 | :buffer BUFFER -- BUFFER is the buffer (or buffer-name) to associate | 2307 | :buffer BUFFER -- BUFFER is the buffer (or buffer-name) to associate |
| 2309 | with the process. Process output goes at the end of that buffer, | 2308 | with the process. Process output goes at the end of that buffer, |
| 2310 | unless you specify an output stream or filter function to handle the | 2309 | unless you specify a filter function to handle the output. If BUFFER |
| 2311 | output. If BUFFER is not given, the value of NAME is used. | 2310 | is not given, the value of NAME is used. |
| 2312 | 2311 | ||
| 2313 | :coding CODING -- If CODING is a symbol, it specifies the coding | 2312 | :coding CODING -- If CODING is a symbol, it specifies the coding |
| 2314 | system used for both reading and writing for this process. If CODING | 2313 | system used for both reading and writing for this process. If CODING |
| @@ -3022,8 +3021,8 @@ the value of PORT is used. | |||
| 3022 | 3021 | ||
| 3023 | :buffer BUFFER -- BUFFER is the buffer (or buffer-name) to associate | 3022 | :buffer BUFFER -- BUFFER is the buffer (or buffer-name) to associate |
| 3024 | with the process. Process output goes at the end of that buffer, | 3023 | with the process. Process output goes at the end of that buffer, |
| 3025 | unless you specify an output stream or filter function to handle the | 3024 | unless you specify a filter function to handle the output. If BUFFER |
| 3026 | output. If BUFFER is not given, the value of NAME is used. | 3025 | is not given, the value of NAME is used. |
| 3027 | 3026 | ||
| 3028 | :coding CODING -- If CODING is a symbol, it specifies the coding | 3027 | :coding CODING -- If CODING is a symbol, it specifies the coding |
| 3029 | system used for both reading and writing for this process. If CODING | 3028 | system used for both reading and writing for this process. If CODING |
| @@ -3685,9 +3684,8 @@ to make it unique. | |||
| 3685 | 3684 | ||
| 3686 | :buffer BUFFER -- BUFFER is the buffer (or buffer-name) to associate | 3685 | :buffer BUFFER -- BUFFER is the buffer (or buffer-name) to associate |
| 3687 | with the process. Process output goes at end of that buffer, unless | 3686 | with the process. Process output goes at end of that buffer, unless |
| 3688 | you specify an output stream or filter function to handle the output. | 3687 | you specify a filter function to handle the output. BUFFER may be |
| 3689 | BUFFER may be also nil, meaning that this process is not associated | 3688 | also nil, meaning that this process is not associated with any buffer. |
| 3690 | with any buffer. | ||
| 3691 | 3689 | ||
| 3692 | :host HOST -- HOST is name of the host to connect to, or its IP | 3690 | :host HOST -- HOST is name of the host to connect to, or its IP |
| 3693 | address. The symbol `local' specifies the local host. If specified | 3691 | address. The symbol `local' specifies the local host. If specified |