From: Tino Calancha Date: Fri, 26 Aug 2016 06:27:37 +0000 (+0900) Subject: Rename option to shell-command-dont-erase-buffer X-Git-Tag: emacs-26.0.90~1693 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b39c0b31f0328da8b1a87226d5cfd7d46af62c0f;p=emacs.git Rename option to shell-command-dont-erase-buffer Suggested by Clément Pit--Claudel in: http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00487.html * lisp/simple.el (shell-command-dont-erase-buffer): (shell-command--save-pos-or-erase): (shell-command--set-point-after-cmd): (shell-command-on-region): * doc/emacs/misc.texi (shell-command-dont-erase-buffer): * etc/NEWS (Changes in Emacs 25.2): Rename from shell-command-not-erase-buffer. --- diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index acddb7a8f70..502ccad1382 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -771,10 +771,10 @@ the output buffer. But if you change the value of the variable @code{shell-command-default-error-buffer} to a string, error output is inserted into a buffer of that name. -@vindex shell-command-not-erase-buffer +@vindex shell-command-dont-erase-buffer By default, the output buffer is erased between shell commands. If you change the value of the variable -@code{shell-command-not-erase-buffer} to a non-@code{nil} value, +@code{shell-command-dont-erase-buffer} to a non-@code{nil} value, the output buffer is not erased. This variable also controls where to set the point in the output buffer after the command completes; see the documentation of the variable for details. diff --git a/etc/NEWS b/etc/NEWS index d30d1faf7ab..1290fa4b63c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -60,12 +60,12 @@ affected by this, as SGI stopped supporting IRIX in December 2013. inferior shell with the buffer region as input. +++ -** The new user option 'shell-command-not-erase-buffer' controls +** The new user option 'shell-command-dont-erase-buffer' controls if the output buffer is erased between shell commands; if non-nil, the output buffer is not erased; this variable also controls where to set the point in the output buffer: beginning of the output, end of the buffer or save the point. -When 'shell-command-not-erase-buffer' is nil, the default value, +When 'shell-command-dont-erase-buffer' is nil, the default value, the behaviour of 'shell-command', 'shell-command-on-region' and 'async-shell-command' is as usual. diff --git a/lisp/simple.el b/lisp/simple.el index de8883a9376..04a525c4392 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -37,7 +37,7 @@ (defvar compilation-current-error) (defvar compilation-context-lines) -(defcustom shell-command-not-erase-buffer nil +(defcustom shell-command-dont-erase-buffer nil "If non-nil, output buffer is not erased between shell commands. Also, a non-nil value set the point in the output buffer once the command complete. @@ -56,7 +56,7 @@ restore the buffer position before the command." "Point position in the output buffer after command complete. It is an alist (BUFFER . POS), where BUFFER is the output buffer, and POS is the point position in BUFFER once the command finish. -This variable is used when `shell-command-not-erase-buffer' is non-nil.") +This variable is used when `shell-command-dont-erase-buffer' is non-nil.") (defcustom idle-update-delay 0.5 "Idle time delay before updating various things on the screen. @@ -3233,8 +3233,8 @@ output buffer and running a new command in the default buffer, (defun shell-command--save-pos-or-erase () "Store a buffer position or erase the buffer. -See `shell-command-not-erase-buffer'." - (let ((sym shell-command-not-erase-buffer) +See `shell-command-dont-erase-buffer'." + (let ((sym shell-command-dont-erase-buffer) pos) (setq buffer-read-only nil) ;; Setting buffer-read-only to nil doesn't suffice @@ -3257,8 +3257,8 @@ BUFFER is the output buffer of the command; if nil, then defaults to the current BUFFER. Set point to the `cdr' of the element in `shell-command-saved-pos' whose `car' is BUFFER." - (when shell-command-not-erase-buffer - (let* ((sym shell-command-not-erase-buffer) + (when shell-command-dont-erase-buffer + (let* ((sym shell-command-dont-erase-buffer) (buf (or buffer (current-buffer))) (pos (alist-get buf shell-command-saved-pos))) (setq shell-command-saved-pos @@ -3340,7 +3340,7 @@ The optional second argument OUTPUT-BUFFER, if non-nil, says to put the output in some other buffer. If OUTPUT-BUFFER is a buffer or buffer name, erase that buffer and insert the output there; a non-nil value of -`shell-command-not-erase-buffer' prevent to erase the buffer. +`shell-command-dont-erase-buffer' prevent to erase the buffer. If OUTPUT-BUFFER is not a buffer and not nil, insert the output in current buffer after point leaving mark after it. This cannot be done asynchronously. @@ -3562,7 +3562,7 @@ and are only used if a pop-up buffer is displayed." ;; We have a sentinel to prevent insertion of a termination message ;; in the buffer itself, and to set the point in the buffer when -;; `shell-command-not-erase-buffer' is non-nil. +;; `shell-command-dont-erase-buffer' is non-nil. (defun shell-command-sentinel (process signal) (when (memq (process-status process) '(exit signal)) (shell-command--set-point-after-cmd (process-buffer process)) @@ -3603,7 +3603,7 @@ 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, erase that buffer and insert the output there; a non-nil value of -`shell-command-not-erase-buffer' prevent to erase the buffer. +`shell-command-dont-erase-buffer' prevent to erase the buffer. If the value is nil, use the buffer `*Shell Command Output*'. Any other non-nil value means to insert the output in the current buffer after START. @@ -3683,7 +3683,7 @@ interactively, this is t." (or output-buffer "*Shell Command Output*")))) (unwind-protect (if (and (eq buffer (current-buffer)) - (or (not shell-command-not-erase-buffer) + (or (not shell-command-dont-erase-buffer) (and (not (eq buffer (get-buffer "*Shell Command Output*"))) (not (region-active-p))))) ;; If the input is the same buffer as the output,