aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina2014-12-26 17:14:18 -0300
committerFabián Ezequiel Gallina2014-12-26 17:14:18 -0300
commit8cf42182b8da79bb4a2f2f704fa0d627304f5165 (patch)
tree8ef794c18cb11d13b7ffd9a6963d0b9f85dc231e
parent807c3413c478be964f24b5ecc44712ce3358001e (diff)
downloademacs-8cf42182b8da79bb4a2f2f704fa0d627304f5165.tar.gz
emacs-8cf42182b8da79bb4a2f2f704fa0d627304f5165.zip
Revert "Prevent Python process shell buffer to pop twice."
This reverts commit 4256626a7ac486446f4dea9c12df3057053825a7.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/python.el2
2 files changed, 1 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c6b23dac0b..8d231a487e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4645,12 +4645,6 @@
4645 4645
46462014-07-28 Fabián Ezequiel Gallina <fgallina@gnu.org> 46462014-07-28 Fabián Ezequiel Gallina <fgallina@gnu.org>
4647 4647
4648 Prevent Python process shell buffer to pop twice.
4649 * progmodes/python.el (python-shell-switch-to-shell): Do not call
4650 pop-to-buffer.
4651
46522014-07-28 Fabián Ezequiel Gallina <fgallina@gnu.org>
4653
4654 * progmodes/python.el 4648 * progmodes/python.el
4655 (python-shell-with-shell-buffer): New macro. 4649 (python-shell-with-shell-buffer): New macro.
4656 (python-shell-font-lock-get-or-create-buffer) 4650 (python-shell-font-lock-get-or-create-buffer)
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."
2860(defun python-shell-switch-to-shell () 2860(defun python-shell-switch-to-shell ()
2861 "Switch to inferior Python process buffer." 2861 "Switch to inferior Python process buffer."
2862 (interactive) 2862 (interactive)
2863 (process-buffer (python-shell-get-or-create-process)) t) 2863 (pop-to-buffer (process-buffer (python-shell-get-or-create-process)) t))
2864 2864
2865(defun python-shell-send-setup-code () 2865(defun python-shell-send-setup-code ()
2866 "Send all setup code for shell. 2866 "Send all setup code for shell.