Adam Hupp <adam at hupp.org>

(run-python): Import emacs module without waiting; prevents lockup on
error.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8240349570aded868253d822fdec3dd17dc49576..abd5fd53352d3553bec02561d8496e2f3a447203 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-24  Adam Hupp  <adam@hupp.org>
+
+       * progmodes/python.el (run-python): Import emacs module without
+       waiting; prevents lockup on error.
+
 2007-09-23  Richard Stallman  <rms@gnu.org>
 
        * mail/sendmail.el (mail-bury): Delete the frame

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 462445f3d71844629c9ca8970d9336993809ccfe..8929616ef793246755d68c3adf6b14a683df3d49 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1375,7 +1375,7 @@ buffer for a list of commands.)"
       ;; 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-string "import emacs")))
   (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