Use a new user option instead of hard-coding shell display.

* lisp/shell.el (shell-display-buffer-actions): New user option.
(shell): Pass it to `pop-to-buffer' instead of hard-coding
`pop-to-buffer-same-window'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12430b69fb7cc0ede5c0890236dab8d38ed92546..b7c459697a5498f8d1a490116bba856124cbc8e2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,26 +1,8 @@
-2014-12-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+2014-12-23  Sam Steingold  <sds@gnu.org>
 
-       * progmodes/js.el (js--syntax-propertize-regexp-syntax-table): New var.
-       (js-syntax-propertize-regexp): Use it to recognize "slash in
-       a character class" (bug#19397).
-
-2014-12-22  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-       * completion.el: Use post-self-insert-hook (bug#19400).
-       (completion-separator-self-insert-command)
-       (completion-separator-self-insert-autofilling): Remove.
-       (completion-separator-chars): New var.
-       (completion-c-mode-hook, completion-setup-fortran-mode): Use it instead
-       of changing the keymap.
-       (completion--post-self-insert): New function.
-       (dynamic-completion-mode): Use it instead of rebinding keys.
-       (cmpl--completion-string): Rename from completion-string.
-       (add-completion-to-head, delete-completion): Let-bind it explicitly.
-
-2014-12-22  Bozhidar Batsov  <bozhidar@batsov.com>
-
-       * progmodes/ruby-mode.el (ruby--string-region): Simplify code
-       by leveraging `syntax-ppss'.
+       * shell.el (shell-display-buffer-actions): New user option.
+       (shell): Pass it to `pop-to-buffer' instead of hard-coding
+       `pop-to-buffer-same-window'.
 
 2014-12-22  Artur Malabarba  <bruce.connor.am@gmail.com>
 

diff --git a/lisp/shell.el b/lisp/shell.el
index 506f944094bd86a41b4e3fd49acdfb2809e54eb0..480d04a03ebeaac30c545fa54199223f3b3090db 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -308,6 +308,13 @@ 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.")
@@ -718,7 +725,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-same-window buffer)
+  (pop-to-buffer buffer shell-display-buffer-actions)
   (unless (comint-check-proc buffer)
     (let* ((prog (or explicit-shell-file-name
                     (getenv "ESHELL") shell-file-name))