aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristoph Scholtes2011-03-19 12:47:17 -0600
committerChristoph Scholtes2011-03-19 12:47:17 -0600
commit4e19a977b0e4be15a4faa8745487d945dd0c59dd (patch)
treef6335fb494b7371a2f651290f0a3c4bdeffb774d /src
parent20f5695598d3137257e24802479d003ea82eb5f9 (diff)
downloademacs-4e19a977b0e4be15a4faa8745487d945dd0c59dd.tar.gz
emacs-4e19a977b0e4be15a4faa8745487d945dd0c59dd.zip
* process.c (Fformat_network_address): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/process.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index be81dd27584..728b215b9ec 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-03-19 Christoph Scholtes <cschol2112@googlemail.com>
2
3 * process.c (Fformat_network_address): Doc fix.
4
12011-03-19 Chong Yidong <cyd@stupidchicken.com> 52011-03-19 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * buffer.h (BUF_BEGV, BUF_BEGV_BYTE, BUF_ZV, BUF_ZV_BYTE, BUF_PT) 7 * buffer.h (BUF_BEGV, BUF_BEGV_BYTE, BUF_ZV, BUF_ZV_BYTE, BUF_PT)
diff --git a/src/process.c b/src/process.c
index b3773ed5571..9a33500dc4e 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1598,9 +1598,9 @@ at end of BUFFER, unless you specify an output stream or filter
1598function to handle the output. BUFFER may also be nil, meaning that 1598function to handle the output. BUFFER may also be nil, meaning that
1599this process is not associated with any buffer. 1599this process is not associated with any buffer.
1600 1600
1601PROGRAM is the program file name. It is searched for in PATH. If 1601PROGRAM is the program file name. It is searched for in `exec-path'
1602nil, just associate a pty with the buffer. Remaining arguments are 1602(which see). If nil, just associate a pty with the buffer. Remaining
1603strings to give program as arguments. 1603arguments are strings to give program as arguments.
1604 1604
1605If you want to separate standard output from standard error, invoke 1605If you want to separate standard output from standard error, invoke
1606the command through a shell and redirect one of them using the shell 1606the command through a shell and redirect one of them using the shell