Reintroduce pop-to-buffer-same-window; use it for previous users of same-window-*.

[gnu-emacs] / lisp / shell.el

diff --git a/lisp/shell.el b/lisp/shell.el
index 8c5781f9333356dca0aa531210f35ec971bb3444..96c0d27372ef4d2d35228d074e8ade0bb85937de 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -652,7 +652,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).
-  (switch-to-buffer buffer)
+  (pop-to-buffer-same-window buffer)
   (unless (comint-check-proc buffer)
     (let* ((prog (or explicit-shell-file-name
                     (getenv "ESHELL") shell-file-name))