diff options
| author | Stefan Kangas | 2019-10-17 12:55:25 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2019-10-17 12:55:25 +0200 |
| commit | 3cf92da6fa692656d64b70e510efcf4e3682f978 (patch) | |
| tree | ab095f5685899951563d42e3c6ca446ca4f06d42 | |
| parent | f75f90a5ddb5e282594483dd7b5dae36f94794c3 (diff) | |
| download | emacs-3cf92da6fa692656d64b70e510efcf4e3682f978.tar.gz emacs-3cf92da6fa692656d64b70e510efcf4e3682f978.zip | |
Improve documentation of shell-command-prompt-show-cwd
* doc/emacs/misc.texi (Single Shell):
* lisp/simple.el (shell-command): Document
'shell-command-prompt-show-cwd'. (Bug#4987)
| -rw-r--r-- | doc/emacs/misc.texi | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 2 |
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 | |||
| 787 | command output. The default value is @code{nil} that means to use | 787 | command output. The default value is @code{nil} that means to use |
| 788 | the same number of columns as provided by the shell. | 788 | the 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 | ||
| 792 | prompts, customize the variable @code{shell-command-prompt-show-cwd} | ||
| 793 | to 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)." | |||
| 3508 | With prefix argument, insert the COMMAND's output at point. | 3508 | With prefix argument, insert the COMMAND's output at point. |
| 3509 | 3509 | ||
| 3510 | Interactively, prompt for COMMAND in the minibuffer. | 3510 | Interactively, prompt for COMMAND in the minibuffer. |
| 3511 | If `shell-command-prompt-show-cwd' is non-nil, show the current | ||
| 3512 | directory in the prompt. | ||
| 3511 | 3513 | ||
| 3512 | If COMMAND ends in `&', execute it asynchronously. | 3514 | If COMMAND ends in `&', execute it asynchronously. |
| 3513 | The output appears in the buffer `*Async Shell Command*'. | 3515 | The output appears in the buffer `*Async Shell Command*'. |