aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/misc.texi5
-rw-r--r--lisp/simple.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 3bfb729dc78..63b65e779c6 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -787,6 +787,11 @@ A positive integer tells the shell to use that number of columns for
787command output. The default value is @code{nil} that means to use 787command output. The default value is @code{nil} that means to use
788the same number of columns as provided by the shell. 788the same number of columns as provided by the shell.
789 789
790@vindex shell-command-prompt-show-cwd
791 To make the above commands show the current directory in their
792prompts, customize the variable @code{shell-command-prompt-show-cwd}
793to a non-nil value.
794
790@kindex M-| 795@kindex M-|
791@findex shell-command-on-region 796@findex shell-command-on-region
792 @kbd{M-|} (@code{shell-command-on-region}) is like @kbd{M-!}, but 797 @kbd{M-|} (@code{shell-command-on-region}) is like @kbd{M-!}, but
diff --git a/lisp/simple.el b/lisp/simple.el
index e44b877931b..cd674c36e7b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3508,6 +3508,8 @@ a shell (with its need to quote arguments)."
3508With prefix argument, insert the COMMAND's output at point. 3508With prefix argument, insert the COMMAND's output at point.
3509 3509
3510Interactively, prompt for COMMAND in the minibuffer. 3510Interactively, prompt for COMMAND in the minibuffer.
3511If `shell-command-prompt-show-cwd' is non-nil, show the current
3512directory in the prompt.
3511 3513
3512If COMMAND ends in `&', execute it asynchronously. 3514If COMMAND ends in `&', execute it asynchronously.
3513The output appears in the buffer `*Async Shell Command*'. 3515The output appears in the buffer `*Async Shell Command*'.