diff options
| author | Glenn Morris | 2018-10-31 07:50:57 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-10-31 07:50:57 -0700 |
| commit | 3a739236d061cf44dcba77f163e6087be4fd09fa (patch) | |
| tree | 37ba2826d46d4157de3b6b7cd2c03264e3467641 /src/callproc.c | |
| parent | 5fec8294a7eb50a4ada26519cd578006b8d16b35 (diff) | |
| parent | eb903d8f20ab0c31daa27a08b0acfd30115c7b5e (diff) | |
| download | emacs-3a739236d061cf44dcba77f163e6087be4fd09fa.tar.gz emacs-3a739236d061cf44dcba77f163e6087be4fd09fa.zip | |
Merge from origin/emacs-26
eb903d8 * lisp/emacs-lisp/pcase.el: Improve docstrings.
86abbb3 * lisp/emacs-lisp/rx.el (rx): Fix typo in doc string. (Bug#3...
ced58d3 Improve doc string of 'call-process'
38f88a7 Document that generic functions cannot be commands
5aeddfa * lisp/mail/rmailsum.el (rmail-summary-output): Add lost word...
10e0fd8 Add index entries for more isearch commands/bindings (Bug#32990)
de28184 * lisp/simple.el (filter-buffer-substring): Clarify doc (Bug#...
d192c16 Fix recent change in lispref/processes.texi.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/callproc.c b/src/callproc.c index e6a81802936..a2cfd2e94da 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -221,15 +221,20 @@ DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0, | |||
| 221 | doc: /* Call PROGRAM synchronously in separate process. | 221 | doc: /* Call PROGRAM synchronously in separate process. |
| 222 | The remaining arguments are optional. | 222 | The remaining arguments are optional. |
| 223 | The program's input comes from file INFILE (nil means `/dev/null'). | 223 | The program's input comes from file INFILE (nil means `/dev/null'). |
| 224 | Insert output in DESTINATION before point; t means current buffer; nil for DESTINATION | 224 | |
| 225 | means discard it; 0 means discard and don't wait; and `(:file FILE)', where | 225 | Third argument DESTINATION specifies how to handle program's output. |
| 226 | FILE is a file name string, means that it should be written to that file | 226 | If DESTINATION is a buffer, or t that stands for the current buffer, |
| 227 | (if the file already exists it is overwritten). | 227 | it means insert output in that buffer before point. |
| 228 | If DESTINATION is nil, it means discard output; 0 means discard | ||
| 229 | and don't wait for the program to terminate. | ||
| 230 | If DESTINATION is `(:file FILE)', where FILE is a file name string, | ||
| 231 | it means that output should be written to that file (if the file | ||
| 232 | already exists it is overwritten). | ||
| 228 | DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case, | 233 | DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case, |
| 229 | REAL-BUFFER says what to do with standard output, as above, | 234 | REAL-BUFFER says what to do with standard output, as above, |
| 230 | while STDERR-FILE says what to do with standard error in the child. | 235 | while STDERR-FILE says what to do with standard error in the child. |
| 231 | STDERR-FILE may be nil (discard standard error output), | 236 | STDERR-FILE may be nil (discard standard error output), |
| 232 | t (mix it with ordinary output), or a file name string. | 237 | t (mix it with ordinary output), or a file name string. |
| 233 | 238 | ||
| 234 | Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted. | 239 | Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted. |
| 235 | Remaining arguments are strings passed as command arguments to PROGRAM. | 240 | Remaining arguments are strings passed as command arguments to PROGRAM. |