[Emacs-diffs] Changes to emacs/lisp/progmodes/python.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        06/08/28 21:58:28

Index: progmodes/python.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/python.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- progmodes/python.el 28 Aug 2006 21:13:32 -0000      1.44
+++ progmodes/python.el 28 Aug 2006 21:58:27 -0000      1.45
@@ -1330,22 +1330,20 @@
   ;; (not a name) in Python buffers from which `run-python' &c is
   ;; invoked.  Would support multiple processes better.
   (when (or new (not (comint-check-proc python-buffer)))
-    (save-current-buffer
+    (with-current-buffer
       (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
             (path (getenv "PYTHONPATH"))
             (process-environment       ; to import emacs.py
              (cons (concat "PYTHONPATH=" data-directory
                            (if path (concat ":" path)))
                    process-environment)))
-       (set-buffer (apply 'make-comint-in-buffer "Python"
-                          (generate-new-buffer "*Python*")
+          (apply 'make-comint-in-buffer "Python"
+                 (if new (generate-new-buffer "*Python*") "*Python*")
                           (car cmdlist) nil (cdr cmdlist)))
        (setq-default python-buffer (current-buffer))
-       (setq python-buffer (current-buffer)))
+      (setq python-buffer (current-buffer))
       (accept-process-output (get-buffer-process python-buffer) 5)
-      (inferior-python-mode)))
-  (if (derived-mode-p 'python-mode)
-      (setq python-buffer (default-value 'python-buffer))) ; buffer-local
+      (inferior-python-mode)
   ;; Load function definitions we need.
   ;; Before the preoutput function was used, this was done via -c in
   ;; cmdlist, but that loses the banner and doesn't run the startup
@@ -1353,7 +1351,9 @@
   ;; seems worth putting in a separate file, and it's probably cleaner
   ;; to put it in a module.
   ;; Ensure we're at a prompt before doing anything else.
-  (python-send-receive "import emacs; print '_emacs_out ()'")
+      (python-send-receive "import emacs; print '_emacs_out ()'")))
+  (if (derived-mode-p 'python-mode)
+      (setq python-buffer (default-value 'python-buffer))) ; buffer-local
   ;; Without this, help output goes into the inferior python buffer if
   ;; the process isn't already running.
   (sit-for 1 t)        ;Should we use accept-process-output instead?  --Stef
@@ -1369,8 +1369,8 @@
 (defun python-send-command (command)
   "Like `python-send-string' but resets `compilation-shell-minor-mode'.
 COMMAND should be a single statement."
-  (assert (not (string-match "\n" command)))
-  (let ((end (marker-position (process-mark (python-proc)))))
+  ;; (assert (not (string-match "\n" command)))
+  ;; (let ((end (marker-position (process-mark (python-proc)))))
     (with-current-buffer python-buffer (goto-char (point-max)))
     (compilation-forget-errors)
     (python-send-string command)
@@ -1382,7 +1382,7 @@
     ;; (python-send-receive "print '_emacs_out ()'")
     ;; (with-current-buffer python-buffer
     ;;   (set-marker compilation-parsing-end end))
-    ))
+    ) ;;)
 
 (defun python-send-region (start end)
   "Send the region to the inferior Python process."