diff options
| author | Chong Yidong | 2011-04-08 14:53:26 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-04-08 14:53:26 -0400 |
| commit | 6b8bc570715801cb194dc4273370eab87628e8bf (patch) | |
| tree | 01e4531fd38069dffbfb0150a2a596ddd8de2bd2 /src/process.c | |
| parent | 3726838a9cca22d420036cd2462398f54318f5d5 (diff) | |
| parent | 0080dc6bd919f83c036bb6072800032b1723b248 (diff) | |
| download | emacs-6b8bc570715801cb194dc4273370eab87628e8bf.tar.gz emacs-6b8bc570715801cb194dc4273370eab87628e8bf.zip | |
Merge changes from emacs-23 branch
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index 4476014edfa..6cddbf6d1a9 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -1261,9 +1261,9 @@ at end of BUFFER, unless you specify an output stream or filter | |||
| 1261 | function to handle the output. BUFFER may also be nil, meaning that | 1261 | function to handle the output. BUFFER may also be nil, meaning that |
| 1262 | this process is not associated with any buffer. | 1262 | this process is not associated with any buffer. |
| 1263 | 1263 | ||
| 1264 | PROGRAM is the program file name. It is searched for in PATH. If | 1264 | PROGRAM is the program file name. It is searched for in `exec-path' |
| 1265 | nil, just associate a pty with the buffer. Remaining arguments are | 1265 | (which see). If nil, just associate a pty with the buffer. Remaining |
| 1266 | strings to give program as arguments. | 1266 | arguments are strings to give program as arguments. |
| 1267 | 1267 | ||
| 1268 | If you want to separate standard output from standard error, invoke | 1268 | If you want to separate standard output from standard error, invoke |
| 1269 | the command through a shell and redirect one of them using the shell | 1269 | the command through a shell and redirect one of them using the shell |