summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTino Calancha <tino.calancha@gmail.com>2016-07-22 14:47:43 +0900
committerTino Calancha <tino.calancha@gmail.com>2016-07-22 14:47:43 +0900
commitb13b728cc2dfaf2563fecc1fea502f422913ca07 (patch)
treef3b74031283ecf45367e749e6cc9fd0896ceb44f
parentb35ec0ab648268d5427561637c3e86eb885ce0d3 (diff)
Fix shell-command[-on-region] doc strings
* lisp/simple.el (shell-command, shell-command-on-region): Drop the sentence saying that the command may delete the buffer '*Shell Command Output*': the command never delete such buffer (Bug#23936).
-rw-r--r--lisp/simple.el7
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 51c9100d2c..e91b6e02a9 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3288,9 +3288,6 @@ If there is output and an error, and you did not specify \"insert it
in the current buffer\", a message about the error goes at the end
of the output.
-If there is no output, or if output is inserted in the current buffer,
-then `*Shell Command Output*' is deleted.
-
If the optional third argument ERROR-BUFFER is non-nil, it is a buffer
or buffer name to which to direct the command's standard error output.
If it is nil, error output is mingled with regular output.
@@ -3535,9 +3532,7 @@ Otherwise it is displayed in the buffer `*Shell Command Output*'.
The output is available in that buffer in both cases.
If there is output and an error, a message about the error
-appears at the end of the output. If there is no output, or if
-output is inserted in the current buffer, the buffer `*Shell
-Command Output*' is deleted.
+appears at the end of the output.
Optional fourth arg OUTPUT-BUFFER specifies where to put the
command's output. If the value is a buffer or buffer name,