Revert "Prevent Python process shell buffer to pop twice."

This reverts commit 4256626a7ac486446f4dea9c12df3057053825a7.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c6b23dac0b4c48ce20a5864e82f332a6bfdf800..8d231a487e33098c83d3511ca603c9aa2878b6b5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4643,12 +4643,6 @@
        string delimiter.
        (python-mode): Use it.
 
-2014-07-28  Fabián Ezequiel Gallina  <fgallina@gnu.org>
-
-       Prevent Python process shell buffer to pop twice.
-       * progmodes/python.el (python-shell-switch-to-shell): Do not call
-       pop-to-buffer.
-
 2014-07-28  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
        * progmodes/python.el

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 35e24e14e1c9eca9b6491a297670e68eeebf5bc0..47c6a90bbde9e80da0be8cb3cc1bfc3913acaf1a 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2860,7 +2860,7 @@ If DELETE is non-nil, delete the file afterwards."
 (defun python-shell-switch-to-shell ()
   "Switch to inferior Python process buffer."
   (interactive)
-  (process-buffer (python-shell-get-or-create-process)) t)
+  (pop-to-buffer (process-buffer (python-shell-get-or-create-process)) t))
 
 (defun python-shell-send-setup-code ()
   "Send all setup code for shell.