diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-02-01 23:21:20 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-02-01 23:21:20 -0800 |
| commit | 1b9f60cc53ca3918bbf807920cbaa43cf298a4cb (patch) | |
| tree | 31dbc365c30a39eb1bf1537469602b8670b08fe5 | |
| parent | 7e2734bc381568d40f83d6cdfa7043bdfdde17f9 (diff) | |
| download | emacs-1b9f60cc53ca3918bbf807920cbaa43cf298a4cb.tar.gz | |
Tiny doc tweaks for call-process's :file spec.
* doc/lispref/processes.texi (Synchronous Processes):
Mention call-process's :file gets overwritten.
* src/callproc.c (Fcall_process, Fcall_process_region): Doc fix.
* etc/NEWS: Markup.
| -rw-r--r-- | doc/lispref/ChangeLog | 3 | ||||
| -rw-r--r-- | doc/lispref/processes.texi | 3 | ||||
| -rw-r--r-- | etc/NEWS | 5 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/callproc.c | 5 |
5 files changed, 13 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index f95b53bc45f..b441248858e 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,8 @@ 2012-02-02 Glenn Morris <rgm@gnu.org> + * processes.texi (Synchronous Processes): + Mention call-process's :file gets overwritten. + * commands.texi (Reading One Event): * help.texi (Help Functions): Document read-char-choice. diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 38eb5a86471..4cfc954cd1f 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -300,7 +300,8 @@ MS-DOS doesn't support asynchronous subprocesses, so this option doesn't work there. @item @code{(:file @var{file-name})} -Send the output to the file name specified. +Send the output to the file name specified, overwriting it if it +already exists. @item @code{(@var{real-destination} @var{error-destination})} Keep the standard output stream separate from the standard error stream; @@ -1240,8 +1240,9 @@ set of "wrapping" filters, similar to around advice. ** `server-eval-at' is provided to allow evaluating forms on different Emacs server instances. -** `call-process' allows a `(:file "file")' spec to redirect STDOUT to -a file. ++++ +** `call-process' and `call-process-region' allow a `(:file "file")' spec +to redirect STDOUT to a file. --- ** Variable `stack-trace-on-error' removed. diff --git a/src/ChangeLog b/src/ChangeLog index 800409d2377..77c3bc4f5dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2012-02-02 Glenn Morris <rgm@gnu.org> + * callproc.c (Fcall_process, Fcall_process_region): Doc fix. + * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: Unconditionally set to t. (Bug#10673) * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: 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. The program's input comes from file INFILE (nil means `/dev/null'). Insert output in BUFFER before point; t means current buffer; nil for BUFFER means discard it; 0 means discard and don't wait; and `(:file FILE)', where - FILE is a file name string, means that it should be written to that file. + FILE is a file name string, means that it should be written to that file + \(if the file already exists it is overwritten). BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, REAL-BUFFER says what to do with standard output, as above, 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. Insert output in BUFFER before point; t means current buffer; nil for BUFFER means discard it; 0 means discard and don't wait; and `(:file FILE)', where FILE is a file name string, means that it should be - written to that file. + written to that file (if the file already exists it is overwritten). BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, REAL-BUFFER says what to do with standard output, as above, while STDERR-FILE says what to do with standard error in the child. |