procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve documentation of 'shell-command-dont-erase-buffer'

Browse source 
* doc/emacs/misc.texi (Single Shell):
* lisp/simple.el (shell-command, shell-command-on-region):
Document that non-nil value of 'shell-command-dont-erase-buffer'
affects what is displayed in the echo area after the command.
(Bug#61100)
This commit is contained in:
Eli Zaretskii 2023-01-27 19:01:49 +02:00
parent 00629c0396
commit 194bc97879
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/emacs/misc.texi
View file

@ -751,6 +751,8 @@ Command Output*"} (@code{shell-command-buffer-name}) buffer (if the
output is long). The variables @code{resize-mini-windows} and output is long). The variables @code{resize-mini-windows} and
@code{max-mini-window-height} (@pxref{Minibuffer Edit}) control when @code{max-mini-window-height} (@pxref{Minibuffer Edit}) control when
Emacs should consider the output to be too long for the echo area. Emacs should consider the output to be too long for the echo area.
Note that customizing @code{shell-command-dont-erase-buffer},
described below, can affect what is displayed in the echo area.
For instance, one way to decompress a file named @file{foo.gz} is to For instance, one way to decompress a file named @file{foo.gz} is to
type @kbd{M-! gunzip foo.gz @key{RET}}. That shell command normally type @kbd{M-! gunzip foo.gz @key{RET}}. That shell command normally
@ -867,6 +869,10 @@ Restores the position of point as it was before inserting the
shell-command output. shell-command output.
@end table @end table
Note that if this option is non-@code{nil}, the output shown in the
echo area could be from more than just the last command, since the
echo area just displays a portion of the output buffer.
In case the output buffer is not the current buffer, shell command In case the output buffer is not the current buffer, shell command
output is appended at the end of this buffer. output is appended at the end of this buffer.

6
lisp/simple.el
View file

@ -4547,6 +4547,9 @@ If the output is short enough to display in the echo area
\(determined by the variable `max-mini-window-height' if \(determined by the variable `max-mini-window-height' if
`resize-mini-windows' is non-nil), it is shown there. `resize-mini-windows' is non-nil), it is shown there.
Otherwise, the buffer containing the output is displayed. Otherwise, the buffer containing the output is displayed.
Note that if `shell-command-dont-erase-buffer' is non-nil,
the echo area could display more than just the output of the
last command.
If there is output and an error, and you did not specify \"insert it 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 in the current buffer\", a message about the error goes at the end
@ -4829,6 +4832,9 @@ If the output is short enough to display in the echo area
`resize-mini-windows' is non-nil), it is shown there. `resize-mini-windows' is non-nil), it is shown there.
Otherwise it is displayed in the buffer named by `shell-command-buffer-name'. Otherwise it is displayed in the buffer named by `shell-command-buffer-name'.
The output is available in that buffer in both cases. The output is available in that buffer in both cases.
Note that if `shell-command-dont-erase-buffer' is non-nil,
the echo area could display more than just the output of the
last command.
If there is output and an error, a message about the error If there is output and an error, a message about the error
appears at the end of the output. appears at the end of the output.