aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorGlenn Morris2007-09-24 00:12:25 +0000
committerGlenn Morris2007-09-24 00:12:25 +0000
commitf4ff3e5cc0e873be609cf6172386c56587a83f31 (patch)
tree5c2e2dc493e2bef967132622d5abe401cfa1069b /lisp/progmodes/python.el
parent3ae2e3a37fae680f44f23170cc06d160d694b831 (diff)
downloademacs-f4ff3e5cc0e873be609cf6172386c56587a83f31.tar.gz
emacs-f4ff3e5cc0e873be609cf6172386c56587a83f31.zip
Adam Hupp <adam at hupp.org>
(run-python): Import emacs module without waiting; prevents lockup on error.
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 462445f3d71..8929616ef79 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1375,7 +1375,7 @@ buffer for a list of commands.)"
1375 ;; seems worth putting in a separate file, and it's probably cleaner 1375 ;; seems worth putting in a separate file, and it's probably cleaner
1376 ;; to put it in a module. 1376 ;; to put it in a module.
1377 ;; Ensure we're at a prompt before doing anything else. 1377 ;; Ensure we're at a prompt before doing anything else.
1378 (python-send-receive "import emacs; print '_emacs_out ()'"))) 1378 (python-send-string "import emacs")))
1379 (if (derived-mode-p 'python-mode) 1379 (if (derived-mode-p 'python-mode)
1380 (setq python-buffer (default-value 'python-buffer))) ; buffer-local 1380 (setq python-buffer (default-value 'python-buffer))) ; buffer-local
1381 ;; Without this, help output goes into the inferior python buffer if 1381 ;; Without this, help output goes into the inferior python buffer if