[Emacs-diffs] master 8cf4218: Revert "Prevent Python process shell buffer to pop twice."

[Fabián Ezequiel Gallina]

branch: master
commit 8cf42182b8da79bb4a2f2f704fa0d627304f5165
Author: Fabián Ezequiel Gallina <address@hidden>
Commit: Fabián Ezequiel Gallina <address@hidden>

    Revert "Prevent Python process shell buffer to pop twice."
    
    This reverts commit 4256626a7ac486446f4dea9c12df3057053825a7.
---
 lisp/ChangeLog           |    6 ------
 lisp/progmodes/python.el |    2 +-
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c6b23d..8d231a4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4645,12 +4645,6 @@
 
 2014-07-28  Fabián Ezequiel Gallina  <address@hidden>
 
-       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  <address@hidden>
-
        * progmodes/python.el
        (python-shell-with-shell-buffer): New macro.
        (python-shell-font-lock-get-or-create-buffer)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 35e24e1..47c6a90 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.