diff options
| author | Tino Calancha | 2016-07-22 14:47:43 +0900 |
|---|---|---|
| committer | Tino Calancha | 2016-07-22 14:47:43 +0900 |
| commit | b13b728cc2dfaf2563fecc1fea502f422913ca07 (patch) | |
| tree | f3b74031283ecf45367e749e6cc9fd0896ceb44f | |
| parent | b35ec0ab648268d5427561637c3e86eb885ce0d3 (diff) | |
| download | emacs-b13b728cc2dfaf2563fecc1fea502f422913ca07.tar.gz emacs-b13b728cc2dfaf2563fecc1fea502f422913ca07.zip | |
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.el | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 51c9100d2c2..e91b6e02a9c 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 | |||
| 3288 | in the current buffer\", a message about the error goes at the end | 3288 | in the current buffer\", a message about the error goes at the end |
| 3289 | of the output. | 3289 | of the output. |
| 3290 | 3290 | ||
| 3291 | If there is no output, or if output is inserted in the current buffer, | ||
| 3292 | then `*Shell Command Output*' is deleted. | ||
| 3293 | |||
| 3294 | If the optional third argument ERROR-BUFFER is non-nil, it is a buffer | 3291 | If the optional third argument ERROR-BUFFER is non-nil, it is a buffer |
| 3295 | or buffer name to which to direct the command's standard error output. | 3292 | or buffer name to which to direct the command's standard error output. |
| 3296 | If it is nil, error output is mingled with regular output. | 3293 | 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*'. | |||
| 3535 | The output is available in that buffer in both cases. | 3532 | The output is available in that buffer in both cases. |
| 3536 | 3533 | ||
| 3537 | If there is output and an error, a message about the error | 3534 | If there is output and an error, a message about the error |
| 3538 | appears at the end of the output. If there is no output, or if | 3535 | appears at the end of the output. |
| 3539 | output is inserted in the current buffer, the buffer `*Shell | ||
| 3540 | Command Output*' is deleted. | ||
| 3541 | 3536 | ||
| 3542 | Optional fourth arg OUTPUT-BUFFER specifies where to put the | 3537 | Optional fourth arg OUTPUT-BUFFER specifies where to put the |
| 3543 | command's output. If the value is a buffer or buffer name, | 3538 | command's output. If the value is a buffer or buffer name, |