]> git.eshelyaron.com Git - emacs.git/commitdiff
Do not call `switch-to-buffer' in `python-shell-get-or-create-process'
authorFabián Ezequiel Gallina <fgallina@cuca>
Thu, 17 May 2012 03:03:41 +0000 (00:03 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Thu, 17 May 2012 03:03:41 +0000 (00:03 -0300)
For this to work properly `run-python' now calls
`python-shell-make-comint' with the POP argument set to nil.

lisp/progmodes/python.el

index 7cfbb34aea398c2088e182e8008532c5fff520b8..1b98a046b6ac55c5bd8b47a7e9509b0d702b23e4 100644 (file)
@@ -1473,7 +1473,7 @@ run).
         (y-or-n-p "Make dedicated process? ")
         (read-string "Run Python: " (python-shell-parse-command)))
      (list nil (python-shell-parse-command))))
-  (python-shell-make-comint cmd (python-shell-get-process-name dedicated) t)
+  (python-shell-make-comint cmd (python-shell-get-process-name dedicated))
   dedicated)
 
 (defun run-python-internal ()
@@ -1511,8 +1511,7 @@ of commands.)"
 
 (defun python-shell-get-or-create-process ()
   "Get or create an inferior Python process for current buffer and return it."
-  (let* ((old-buffer (current-buffer))
-         (dedicated-proc-name (python-shell-get-process-name t))
+  (let* ((dedicated-proc-name (python-shell-get-process-name t))
          (dedicated-proc-buffer-name (format "*%s*" dedicated-proc-name))
          (global-proc-name  (python-shell-get-process-name nil))
          (global-proc-buffer-name (format "*%s*" global-proc-name))
@@ -1524,7 +1523,6 @@ of commands.)"
           (setq dedicated-running t)
         (setq global-running t)))
     ;; Always prefer dedicated
-    (switch-to-buffer old-buffer)
     (get-buffer-process (if dedicated-running
                             dedicated-proc-buffer-name
                           global-proc-buffer-name))))