aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/callproc.c5
2 files changed, 5 insertions, 2 deletions
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.