diff options
| author | Joakim Verona | 2012-02-05 14:40:28 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-02-05 14:40:28 +0100 |
| commit | 8c5c7f5afa968d06efb6788cf680d5463c389d85 (patch) | |
| tree | a70876b87a7dbdcb936524880492f8fdc661fab0 /src/callproc.c | |
| parent | fbdce5fed745bc78911980466d9374d1101487fc (diff) | |
| parent | 1ff980ae49715eb372acff8a193e36497a7665c4 (diff) | |
| download | emacs-8c5c7f5afa968d06efb6788cf680d5463c389d85.tar.gz emacs-8c5c7f5afa968d06efb6788cf680d5463c389d85.zip | |
ustream
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c index c5208fb93d9..b5b8cadeb68 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -164,7 +164,8 @@ The remaining arguments are optional. | |||
| 164 | The program's input comes from file INFILE (nil means `/dev/null'). | 164 | The program's input comes from file INFILE (nil means `/dev/null'). |
| 165 | Insert output in BUFFER before point; t means current buffer; nil for BUFFER | 165 | Insert output in BUFFER before point; t means current buffer; nil for BUFFER |
| 166 | means discard it; 0 means discard and don't wait; and `(:file FILE)', where | 166 | means discard it; 0 means discard and don't wait; and `(:file FILE)', where |
| 167 | FILE is a file name string, means that it should be written to that file. | 167 | FILE is a file name string, means that it should be written to that file |
| 168 | \(if the file already exists it is overwritten). | ||
| 168 | BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, | 169 | BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, |
| 169 | REAL-BUFFER says what to do with standard output, as above, | 170 | REAL-BUFFER says what to do with standard output, as above, |
| 170 | while STDERR-FILE says what to do with standard error in the child. | 171 | while STDERR-FILE says what to do with standard error in the child. |
| @@ -940,7 +941,7 @@ Delete the text if fourth arg DELETE is non-nil. | |||
| 940 | Insert output in BUFFER before point; t means current buffer; nil for | 941 | Insert output in BUFFER before point; t means current buffer; nil for |
| 941 | BUFFER means discard it; 0 means discard and don't wait; and `(:file | 942 | BUFFER means discard it; 0 means discard and don't wait; and `(:file |
| 942 | FILE)', where FILE is a file name string, means that it should be | 943 | FILE)', where FILE is a file name string, means that it should be |
| 943 | written to that file. | 944 | written to that file (if the file already exists it is overwritten). |
| 944 | BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, | 945 | BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, |
| 945 | REAL-BUFFER says what to do with standard output, as above, | 946 | REAL-BUFFER says what to do with standard output, as above, |
| 946 | while STDERR-FILE says what to do with standard error in the child. | 947 | while STDERR-FILE says what to do with standard error in the child. |