diff options
| author | Chong Yidong | 2011-03-05 15:45:09 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-03-05 15:45:09 -0500 |
| commit | b59a4335cd2e904d160323c9e00e1411c0d973bf (patch) | |
| tree | d6edfeb8abb171a63850b0c5bcff65d52bf6e4a3 | |
| parent | cb6fa1ad87db2d0949576fa5dc01caf7918a4547 (diff) | |
| download | emacs-b59a4335cd2e904d160323c9e00e1411c0d973bf.tar.gz emacs-b59a4335cd2e904d160323c9e00e1411c0d973bf.zip | |
* processes.texi (Synchronous Processes): Minor clarification (Bug#8149).
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/processes.texi | 25 |
2 files changed, 17 insertions, 13 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 25f9225944d..8404b7502b3 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-03-05 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * processes.texi (Synchronous Processes): Minor clarification | ||
| 4 | (Bug#8149). | ||
| 5 | |||
| 1 | 2011-03-03 Glenn Morris <rgm@gnu.org> | 6 | 2011-03-03 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * files.texi (Truenames): Minor clarification. (Bug#2341) | 8 | * files.texi (Truenames): Minor clarification. (Bug#2341) |
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 8a8de0e7fa8..dc9fed58076 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -266,10 +266,9 @@ subprocess by @code{call-process-region} is encoded using a coding | |||
| 266 | system, much like text written into a file. @xref{Coding Systems}. | 266 | system, much like text written into a file. @xref{Coding Systems}. |
| 267 | 267 | ||
| 268 | @defun call-process program &optional infile destination display &rest args | 268 | @defun call-process program &optional infile destination display &rest args |
| 269 | This function calls @var{program} in a separate process and waits for | 269 | This function calls @var{program} and waits for it to finish. |
| 270 | it to finish. | ||
| 271 | 270 | ||
| 272 | The standard input for the process comes from file @var{infile} if | 271 | The standard input for the new process comes from file @var{infile} if |
| 273 | @var{infile} is not @code{nil}, and from the null device otherwise. | 272 | @var{infile} is not @code{nil}, and from the null device otherwise. |
| 274 | The argument @var{destination} says where to put the process output. | 273 | The argument @var{destination} says where to put the process output. |
| 275 | Here are the possibilities: | 274 | Here are the possibilities: |
| @@ -488,10 +487,10 @@ inputinput@point{} | |||
| 488 | @end defun | 487 | @end defun |
| 489 | 488 | ||
| 490 | @defun call-process-shell-command command &optional infile destination display &rest args | 489 | @defun call-process-shell-command command &optional infile destination display &rest args |
| 491 | This function executes the shell command @var{command} synchronously | 490 | This function executes the shell command @var{command} synchronously. |
| 492 | in a separate process. The final arguments @var{args} are additional | 491 | The final arguments @var{args} are additional arguments to add at the |
| 493 | arguments to add at the end of @var{command}. The other arguments | 492 | end of @var{command}. The other arguments are handled as in |
| 494 | are handled as in @code{call-process}. | 493 | @code{call-process}. |
| 495 | @end defun | 494 | @end defun |
| 496 | 495 | ||
| 497 | @defun process-file-shell-command command &optional infile destination display &rest args | 496 | @defun process-file-shell-command command &optional infile destination display &rest args |
| @@ -506,12 +505,12 @@ then returns the command's output as a string. | |||
| 506 | @end defun | 505 | @end defun |
| 507 | 506 | ||
| 508 | @defun process-lines program &rest args | 507 | @defun process-lines program &rest args |
| 509 | This function runs @var{program} in a separate process, waits for it | 508 | This function runs @var{program}, waits for it to finish, and returns |
| 510 | to finish, and returns its output as a list of strings. Each string | 509 | its output as a list of strings. Each string in the list holds a |
| 511 | in the list holds a single line of text output by the program; the | 510 | single line of text output by the program; the end-of-line characters |
| 512 | end-of-line characters are stripped from each line. The arguments | 511 | are stripped from each line. The arguments beyond @var{program}, |
| 513 | beyond @var{program}, @var{args}, are strings that specify | 512 | @var{args}, are strings that specify command-line arguments with which |
| 514 | command-line arguments with which to run the program. | 513 | to run the program. |
| 515 | 514 | ||
| 516 | If @var{program} exits with a non-zero exit status, this function | 515 | If @var{program} exits with a non-zero exit status, this function |
| 517 | signals an error. | 516 | signals an error. |