summaryrefslogtreecommitdiff
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorSam Steingold <sds@gnu.org>2015-01-06 16:32:09 -0500
committerSam Steingold <sds@gnu.org>2015-01-06 16:32:09 -0500
commit95295df44cc2b6e0e2442aeff96b0fe2ceac405c (patch)
treefb4212908118725d2d1a6218f267ff1c201691fc /lisp/shell.el
parentc7511666094a87021e0f3685657bfc9e380d67a7 (diff)
downloademacs-95295df44cc2b6e0e2442aeff96b0fe2ceac405c.tar.gz
Use generic `display-buffer-alist' instead of mode-specific customizations.
* lisp/shell.el (shell-display-buffer-actions): Remove, use `display-buffer-alist' instead.
Diffstat (limited to 'lisp/shell.el')
-rw-r--r--lisp/shell.el9
1 files changed, 1 insertions, 8 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index 6e336eb1403..f71d1407a49 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -309,13 +309,6 @@ for Shell mode only."
(const :tag "on" t))
:group 'shell)
-(defcustom shell-display-buffer-actions display-buffer-base-action
- "The `display-buffer' actions for the `*shell*' buffer."
- :type display-buffer--action-custom-type
- :risky t
- :version "25.1"
- :group 'shell)
-
(defvar shell-dirstack nil
"List of directories saved by pushd in this buffer's shell.
Thus, this does not include the shell's current directory.")
@@ -726,7 +719,7 @@ Otherwise, one argument `-i' is passed to the shell.
;; The buffer's window must be correctly set when we call comint (so
;; that comint sets the COLUMNS env var properly).
- (pop-to-buffer buffer shell-display-buffer-actions)
+ (pop-to-buffer buffer)
(unless (comint-check-proc buffer)
(let* ((prog (or explicit-shell-file-name
(getenv "ESHELL") shell-file-name))