From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Fri, 26 Dec 2014 20:14:18 +0000 (-0300)
Subject: Revert "Prevent Python process shell buffer to pop twice."
X-Git-Tag: emacs-25.0.90~2631^2~15^2~29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8cf42182b8da79bb4a2f2f704fa0d627304f5165;p=emacs.git

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

This reverts commit 4256626a7ac486446f4dea9c12df3057053825a7.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c6b23dac0b..8d231a487e3 100644
--- 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 35e24e14e1c..47c6a90bbde 100644
--- 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.