diff options
| author | Sam Steingold | 2015-01-06 16:32:09 -0500 |
|---|---|---|
| committer | Sam Steingold | 2015-01-06 16:32:09 -0500 |
| commit | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (patch) | |
| tree | fb4212908118725d2d1a6218f267ff1c201691fc /lisp/shell.el | |
| parent | c7511666094a87021e0f3685657bfc9e380d67a7 (diff) | |
| download | emacs-95295df44cc2b6e0e2442aeff96b0fe2ceac405c.tar.gz emacs-95295df44cc2b6e0e2442aeff96b0fe2ceac405c.zip | |
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.el | 9 |
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." | |||
| 309 | (const :tag "on" t)) | 309 | (const :tag "on" t)) |
| 310 | :group 'shell) | 310 | :group 'shell) |
| 311 | 311 | ||
| 312 | (defcustom shell-display-buffer-actions display-buffer-base-action | ||
| 313 | "The `display-buffer' actions for the `*shell*' buffer." | ||
| 314 | :type display-buffer--action-custom-type | ||
| 315 | :risky t | ||
| 316 | :version "25.1" | ||
| 317 | :group 'shell) | ||
| 318 | |||
| 319 | (defvar shell-dirstack nil | 312 | (defvar shell-dirstack nil |
| 320 | "List of directories saved by pushd in this buffer's shell. | 313 | "List of directories saved by pushd in this buffer's shell. |
| 321 | Thus, this does not include the shell's current directory.") | 314 | Thus, this does not include the shell's current directory.") |
| @@ -726,7 +719,7 @@ Otherwise, one argument `-i' is passed to the shell. | |||
| 726 | 719 | ||
| 727 | ;; The buffer's window must be correctly set when we call comint (so | 720 | ;; The buffer's window must be correctly set when we call comint (so |
| 728 | ;; that comint sets the COLUMNS env var properly). | 721 | ;; that comint sets the COLUMNS env var properly). |
| 729 | (pop-to-buffer buffer shell-display-buffer-actions) | 722 | (pop-to-buffer buffer) |
| 730 | (unless (comint-check-proc buffer) | 723 | (unless (comint-check-proc buffer) |
| 731 | (let* ((prog (or explicit-shell-file-name | 724 | (let* ((prog (or explicit-shell-file-name |
| 732 | (getenv "ESHELL") shell-file-name)) | 725 | (getenv "ESHELL") shell-file-name)) |