aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-02-01 23:21:20 -0800
committerGlenn Morris2012-02-01 23:21:20 -0800
commit1b9f60cc53ca3918bbf807920cbaa43cf298a4cb (patch)
tree31dbc365c30a39eb1bf1537469602b8670b08fe5
parent7e2734bc381568d40f83d6cdfa7043bdfdde17f9 (diff)
downloademacs-1b9f60cc53ca3918bbf807920cbaa43cf298a4cb.tar.gz
emacs-1b9f60cc53ca3918bbf807920cbaa43cf298a4cb.zip
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/ChangeLog3
-rw-r--r--doc/lispref/processes.texi3
-rw-r--r--etc/NEWS5
-rw-r--r--src/ChangeLog2
-rw-r--r--src/callproc.c5
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 @@
12012-02-02 Glenn Morris <rgm@gnu.org> 12012-02-02 Glenn Morris <rgm@gnu.org>
2 2
3 * processes.texi (Synchronous Processes):
4 Mention call-process's :file gets overwritten.
5
3 * commands.texi (Reading One Event): 6 * commands.texi (Reading One Event):
4 * help.texi (Help Functions): Document read-char-choice. 7 * help.texi (Help Functions): Document read-char-choice.
5 8
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
300work there. 300work there.
301 301
302@item @code{(:file @var{file-name})} 302@item @code{(:file @var{file-name})}
303Send the output to the file name specified. 303Send the output to the file name specified, overwriting it if it
304already exists.
304 305
305@item @code{(@var{real-destination} @var{error-destination})} 306@item @code{(@var{real-destination} @var{error-destination})}
306Keep the standard output stream separate from the standard error stream; 307Keep the standard output stream separate from the standard error stream;
diff --git a/etc/NEWS b/etc/NEWS
index ec508771abc..7bf9a1c36c4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1240,8 +1240,9 @@ set of "wrapping" filters, similar to around advice.
1240** `server-eval-at' is provided to allow evaluating forms on different 1240** `server-eval-at' is provided to allow evaluating forms on different
1241Emacs server instances. 1241Emacs server instances.
1242 1242
1243** `call-process' allows a `(:file "file")' spec to redirect STDOUT to 1243+++
1244a file. 1244** `call-process' and `call-process-region' allow a `(:file "file")' spec
1245to redirect STDOUT to a file.
1245 1246
1246--- 1247---
1247** Variable `stack-trace-on-error' removed. 1248** 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 @@
12012-02-02 Glenn Morris <rgm@gnu.org> 12012-02-02 Glenn Morris <rgm@gnu.org>
2 2
3 * callproc.c (Fcall_process, Fcall_process_region): Doc fix.
4
3 * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: 5 * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
4 Unconditionally set to t. (Bug#10673) 6 Unconditionally set to t. (Bug#10673)
5 * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: 7 * 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.
164The program's input comes from file INFILE (nil means `/dev/null'). 164The program's input comes from file INFILE (nil means `/dev/null').
165Insert output in BUFFER before point; t means current buffer; nil for BUFFER 165Insert 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).
168BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, 169BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
169REAL-BUFFER says what to do with standard output, as above, 170REAL-BUFFER says what to do with standard output, as above,
170while STDERR-FILE says what to do with standard error in the child. 171while 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.
940Insert output in BUFFER before point; t means current buffer; nil for 941Insert 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).
944BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, 945BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
945REAL-BUFFER says what to do with standard output, as above, 946REAL-BUFFER says what to do with standard output, as above,
946while STDERR-FILE says what to do with standard error in the child. 947while STDERR-FILE says what to do with standard error in the child.