summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-10-30 07:48:02 +0800
committerChong Yidong <cyd@gnu.org>2012-10-30 07:48:02 +0800
commitfc83c2de544c15ce8e4e8fc7c6dd68cc4956a457 (patch)
treedd6d7f0c1b071a650c29b1cc6cb6106e2fd98df9
parentb5dd9a779bafdbac1658b7e610ec04c195a7f21c (diff)
downloademacs-fc83c2de544c15ce8e4e8fc7c6dd68cc4956a457.tar.gz
Document dired-do-async-shell-command changes.
* dired.texi (Shell Commands in Dired): Document changes to the dired-do-async-shell-command.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/dired.texi11
-rw-r--r--etc/NEWS2
3 files changed, 14 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ef6d736db1d..ea5621e7ccf 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-29 Chong Yidong <cyd@gnu.org>
+
+ * dired.texi (Shell Commands in Dired): Document changes to the
+ dired-do-async-shell-command.
+
2012-10-28 Glenn Morris <rgm@gnu.org>
* ack.texi (Acknowledgments): Mention gv.el.
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 8babbcb89ea..c08dc02b04b 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -799,15 +799,20 @@ more matches. @xref{Tags Search}.
@kindex ! @r{(Dired)}
@kindex X @r{(Dired)}
The Dired command @kbd{!} (@code{dired-do-shell-command}) reads a
-shell command string in the minibuffer and runs that shell command on
+shell command string in the minibuffer, and runs that shell command on
one or more files. The files that the shell command operates on are
determined in the usual way for Dired commands (@pxref{Operating on
Files}). The command @kbd{X} is a synonym for @kbd{!}.
The command @kbd{&} (@code{dired-do-async-shell-command}) does the
-same, except that it runs the shell command asynchronously. You can
+same, except that it runs the shell command asynchronously. (You can
also do this with @kbd{!}, by appending a @samp{&} character to the
-end of the shell command.
+end of the shell command.) When the command operates on more than one
+file, it runs multiple parallel copies of the specified shell command,
+one for each file. As an exception, if the specified shell command
+ends in @samp{;} or @samp{;&}, the shell command is run in the
+background on each file sequentially; Emacs waits for each invoked
+shell command to terminate before running the next one.
For both @kbd{!} and @kbd{&}, the working directory for the shell
command is the top-level directory of the Dired buffer.
diff --git a/etc/NEWS b/etc/NEWS
index cfdd3355aa5..2166e1d7658 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -397,7 +397,7 @@ changes in context diffs.
whitespace problems introduced by the diff.
** Dired
-
++++
*** `dired-do-async-shell-command' executes each file sequentially
if the command ends in `;' (when operating on multiple files).
Otherwise, it executes the command on each file in parallel.