diff options
| author | Xue Fuqiao | 2013-05-25 09:55:00 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-05-25 09:55:00 +0800 |
| commit | 38cd43ebed34c8198c5427d6607121620f8ddacf (patch) | |
| tree | 4b9cbd3952121b40a84e3d25c07698d3379b23aa | |
| parent | f9fea26c27e2d3dfc8d29b3e61fb58acf8a7efd6 (diff) | |
| download | emacs-38cd43ebed34c8198c5427d6607121620f8ddacf.tar.gz emacs-38cd43ebed34c8198c5427d6607121620f8ddacf.zip | |
* callproc.c (call_process): Refine the doc string. (Bug#14045)
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/callproc.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1d2af4b2a7d..acbbfb0a50c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-05-25 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * callproc.c (call_process): Refine the doc string. (Bug#14045) | ||
| 4 | |||
| 1 | 2013-05-23 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-05-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * keyboard.c: Apply keyboard decoding only to events that come directly | 7 | * keyboard.c: Apply keyboard decoding only to events that come directly |
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. |
| 191 | The remaining arguments are optional. | 191 | The remaining arguments are optional. |
| 192 | The program's input comes from file INFILE (nil means `/dev/null'). | 192 | The program's input comes from file INFILE (nil means `/dev/null'). |
| 193 | Insert output in BUFFER before point; t means current buffer; nil for BUFFER | 193 | Insert 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). |
| 197 | BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, | 197 | DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case, |
| 198 | REAL-BUFFER says what to do with standard output, as above, | 198 | REAL-BUFFER says what to do with standard output, as above, |
| 199 | while STDERR-FILE says what to do with standard error in the child. | 199 | while STDERR-FILE says what to do with standard error in the child. |
| 200 | STDERR-FILE may be nil (discard standard error output), | 200 | STDERR-FILE may be nil (discard standard error output), |
| @@ -207,12 +207,12 @@ If executable PROGRAM can't be found as an executable, `call-process' | |||
| 207 | signals a Lisp error. `call-process' reports errors in execution of | 207 | signals a Lisp error. `call-process' reports errors in execution of |
| 208 | the program only through its return and output. | 208 | the program only through its return and output. |
| 209 | 209 | ||
| 210 | If BUFFER is 0, `call-process' returns immediately with value nil. | 210 | If DESTINATION is 0, `call-process' returns immediately with value nil. |
| 211 | Otherwise it waits for PROGRAM to terminate | 211 | Otherwise it waits for PROGRAM to terminate |
| 212 | and returns a numeric exit status or a signal description string. | 212 | and returns a numeric exit status or a signal description string. |
| 213 | If you quit, the process is killed with SIGINT, or SIGKILL if you quit again. | 213 | If you quit, the process is killed with SIGINT, or SIGKILL if you quit again. |
| 214 | 214 | ||
| 215 | usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | 215 | usage: (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; |