diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/processes.texi | 16 |
2 files changed, 16 insertions, 6 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index f96cb26a5e1..50cc9cb43b3 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * processes.texi (Synchronous Processes): Update documentation of | ||
| 4 | call-process-shell-command and process-file-shell-command. | ||
| 5 | |||
| 6 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> | ||
| 1 | 2015-03-03 Daniel Colascione <dancol@dancol.org> | 7 | 2015-03-03 Daniel Colascione <dancol@dancol.org> |
| 2 | 8 | ||
| 3 | * control.texi (Generators): Correct missing word. Clarify which | 9 | * control.texi (Generators): Correct missing word. Clarify which |
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 99411af3d46..177cd684f5c 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -503,17 +503,21 @@ inputinput@point{} | |||
| 503 | @c It actually uses shell-command-switch, but no need to mention that here. | 503 | @c It actually uses shell-command-switch, but no need to mention that here. |
| 504 | @end defun | 504 | @end defun |
| 505 | 505 | ||
| 506 | @defun call-process-shell-command command &optional infile destination display &rest args | 506 | @defun call-process-shell-command command &optional infile destination display |
| 507 | This function executes the shell command @var{command} synchronously. | 507 | This function executes the shell command @var{command} synchronously. |
| 508 | The final arguments @var{args} are additional arguments to add at the | 508 | The arguments are handled as in @code{call-process}. An old calling |
| 509 | end of @var{command}. The other arguments are handled as in | 509 | convention allowed to pass any number of additional arguments after |
| 510 | @code{call-process}. | 510 | @var{display}, which were concatenated to @var{command}; this is still |
| 511 | supported, but strongly discouraged. | ||
| 511 | @end defun | 512 | @end defun |
| 512 | 513 | ||
| 513 | @defun process-file-shell-command command &optional infile destination display &rest args | 514 | @defun process-file-shell-command command &optional infile destination display |
| 514 | This function is like @code{call-process-shell-command}, but uses | 515 | This function is like @code{call-process-shell-command}, but uses |
| 515 | @code{process-file} internally. Depending on @code{default-directory}, | 516 | @code{process-file} internally. Depending on @code{default-directory}, |
| 516 | @var{command} can be executed also on remote hosts. | 517 | @var{command} can be executed also on remote hosts. An old calling |
| 518 | convention allowed to pass any number of additional arguments after | ||
| 519 | @var{display}, which were concatenated to @var{command}; this is still | ||
| 520 | supported, but strongly discouraged. | ||
| 517 | @end defun | 521 | @end defun |
| 518 | 522 | ||
| 519 | @defun shell-command-to-string command | 523 | @defun shell-command-to-string command |