bug#4987: 23.1; shell-command: optionally include working dir in prompt

[Stefan Kangas <stefan@marxist.se>]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

Michael Albinus <michael.albinus@gmx.de> writes:

> Shouldn't the user option be mentioned in the docstring and the Emacs
> manual? etc/NEWS is rarely used on a daily basis.

Sure.  How about the attached patch?

Best regards,
Stefan Kangas

[-- Attachment #2: 0001-Improve-documentation-of-shell-command-prompt-show-c.patch --]
[-- Type: application/octet-stream, Size: 1550 bytes --]

From b5a8590ed56d19b38846ab88ed0b58e89808ea8f Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Fri, 11 Oct 2019 15:23:56 +0200
Subject: [PATCH] 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)
---
 doc/emacs/misc.texi | 5 +++++
 lisp/simple.el      | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 3bfb729dc7..d260dff8de 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -787,6 +787,11 @@ Single Shell
 command output.  The default value is @code{nil} that means to use
 the same number of columns as provided by the shell.
 
+@vindex shell-command-promt-show-cwd
+  To make the above commands show the current directory in their
+prompts, set the variable @code{shell-command-prompt-show-cmd} to a
+non-nil value.
+
 @kindex M-|
 @findex shell-command-on-region
   @kbd{M-|} (@code{shell-command-on-region}) is like @kbd{M-!}, but
diff --git a/lisp/simple.el b/lisp/simple.el
index 44ab8e125d..6f57bf15a2 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3505,6 +3505,8 @@ shell-command
 With prefix argument, insert the COMMAND's output at point.
 
 Interactively, prompt for COMMAND in the minibuffer.
+If `shell-command-prompt-show-cwd' is non-nil, show the current
+directory in the prompt.
 
 If COMMAND ends in `&', execute it asynchronously.
 The output appears in the buffer `*Async Shell Command*'.
-- 
2.23.0