aboutsummaryrefslogtreecommitdiffstats
path: root/src/callproc.c
diff options
context:
space:
mode:
authorXue Fuqiao2013-05-25 09:55:00 +0800
committerXue Fuqiao2013-05-25 09:55:00 +0800
commit38cd43ebed34c8198c5427d6607121620f8ddacf (patch)
tree4b9cbd3952121b40a84e3d25c07698d3379b23aa /src/callproc.c
parentf9fea26c27e2d3dfc8d29b3e61fb58acf8a7efd6 (diff)
downloademacs-38cd43ebed34c8198c5427d6607121620f8ddacf.tar.gz
emacs-38cd43ebed34c8198c5427d6607121620f8ddacf.zip
* callproc.c (call_process): Refine the doc string. (Bug#14045)
Diffstat (limited to 'src/callproc.c')
-rw-r--r--src/callproc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 46a37701a40..745d58c45f4 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -190,11 +190,11 @@ DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0,
190 doc: /* Call PROGRAM synchronously in separate process. 190 doc: /* Call PROGRAM synchronously in separate process.
191The remaining arguments are optional. 191The remaining arguments are optional.
192The program's input comes from file INFILE (nil means `/dev/null'). 192The program's input comes from file INFILE (nil means `/dev/null').
193Insert output in BUFFER before point; t means current buffer; nil for BUFFER 193Insert output in DESTINATION before point; t means current buffer; nil for DESTINATION
194 means discard it; 0 means discard and don't wait; and `(:file FILE)', where 194 means discard it; 0 means discard and don't wait; and `(:file FILE)', where
195 FILE is a file name string, means that it should be written to that file 195 FILE is a file name string, means that it should be written to that file
196 \(if the file already exists it is overwritten). 196 \(if the file already exists it is overwritten).
197BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, 197DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case,
198REAL-BUFFER says what to do with standard output, as above, 198REAL-BUFFER says what to do with standard output, as above,
199while STDERR-FILE says what to do with standard error in the child. 199while STDERR-FILE says what to do with standard error in the child.
200STDERR-FILE may be nil (discard standard error output), 200STDERR-FILE may be nil (discard standard error output),
@@ -207,12 +207,12 @@ If executable PROGRAM can't be found as an executable, `call-process'
207signals a Lisp error. `call-process' reports errors in execution of 207signals a Lisp error. `call-process' reports errors in execution of
208the program only through its return and output. 208the program only through its return and output.
209 209
210If BUFFER is 0, `call-process' returns immediately with value nil. 210If DESTINATION is 0, `call-process' returns immediately with value nil.
211Otherwise it waits for PROGRAM to terminate 211Otherwise it waits for PROGRAM to terminate
212and returns a numeric exit status or a signal description string. 212and returns a numeric exit status or a signal description string.
213If you quit, the process is killed with SIGINT, or SIGKILL if you quit again. 213If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
214 214
215usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) 215usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) */)
216 (ptrdiff_t nargs, Lisp_Object *args) 216 (ptrdiff_t nargs, Lisp_Object *args)
217{ 217{
218 Lisp_Object infile, buffer, current_dir, path; 218 Lisp_Object infile, buffer, current_dir, path;