summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2015-02-07 11:04:52 +0200
committerEli Zaretskii <eliz@gnu.org>2015-02-07 11:04:52 +0200
commiteca7da109248c40963c285417b878a8abcd84049 (patch)
tree71fcc8b2d947435de86f16dcb14ad7cbb179ca6c /doc
parent4f5033faf26c69c123452d750bb2adfa2e77666b (diff)
downloademacs-eca7da109248c40963c285417b878a8abcd84049.tar.gz
Complete the remaining documentation updates for 24.5
doc/lispref/processes.texi (Synchronous Processes): Update documentation of call-process-shell-command and process-file-shell-command. etc/NEWS: Mark the entry for changed calling sequence of call-process-shell-command and process-file-shell-command as documented.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/processes.texi16
2 files changed, 15 insertions, 6 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 911e698ad49..be2bb3e79ed 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-07 Eli Zaretskii <eliz@gnu.org>
+
+ * processes.texi (Synchronous Processes): Update documentation of
+ call-process-shell-command and process-file-shell-command.
+
2015-01-24 Eli Zaretskii <eliz@gnu.org>
* searching.texi (Regexp Search): Add a cross-reference to "Syntax
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 621e8a1bfba..cbc9ce4696c 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -503,17 +503,21 @@ inputinput@point{}
@c It actually uses shell-command-switch, but no need to mention that here.
@end defun
-@defun call-process-shell-command command &optional infile destination display &rest args
+@defun call-process-shell-command command &optional infile destination display
This function executes the shell command @var{command} synchronously.
-The final arguments @var{args} are additional arguments to add at the
-end of @var{command}. The other arguments are handled as in
-@code{call-process}.
+The arguments are handled as in @code{call-process}. An old calling
+convention allowed to pass any number of additional arguments after
+@var{display}, which were concatenated to @var{command}; this is still
+supported, but strongly discouraged.
@end defun
-@defun process-file-shell-command command &optional infile destination display &rest args
+@defun process-file-shell-command command &optional infile destination display
This function is like @code{call-process-shell-command}, but uses
@code{process-file} internally. Depending on @code{default-directory},
-@var{command} can be executed also on remote hosts.
+@var{command} can be executed also on remote hosts. An old calling
+convention allowed to pass any number of additional arguments after
+@var{display}, which were concatenated to @var{command}; this is still
+supported, but strongly discouraged.
@end defun
@defun shell-command-to-string command