(shell): If we create a new shell buffer,

select that buffer even if it has been renamed.

diff --git a/lisp/shell.el b/lisp/shell.el
index 3e68ded62ebbfa74eebd3097e93eb12106ed1dcd..c4a3bd79d0fa560a0c00d97549e79c3d8b272a35 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -368,8 +368,9 @@ Otherwise, one argument `-i' is passed to the shell.
                           (if (and xargs-name (boundp xargs-name))
                               (symbol-value xargs-name)
                             '("-i"))))
-       (shell-mode)))
-  (switch-to-buffer "*shell*"))
+       (shell-mode)
+       (switch-to-buffer (current-buffer)))
+    (switch-to-buffer "*shell*")))
 \f
 ;;; Directory tracking
 ;;; ===========================================================================