aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2006-08-28 21:13:34 +0000
committerStefan Monnier2006-08-28 21:13:34 +0000
commit6cc91c85a090cbe73d773f69a68d9da7fd2f7a07 (patch)
tree0f01df3c27fa9d45451ab67df8008aa24a47d9dd
parent81e213dc7cb42ca0195a1b81d5cb1d50164d9182 (diff)
downloademacs-6cc91c85a090cbe73d773f69a68d9da7fd2f7a07.tar.gz
emacs-6cc91c85a090cbe73d773f69a68d9da7fd2f7a07.zip
(python-send-command): Don't wait for the command
to terminate. Don't fiddle with compilation-parsing-end.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/progmodes/python.el13
2 files changed, 16 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c01cd76a45..c0797ec968a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
12006-08-28 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * progmodes/python.el (python-send-command): Don't wait for the command
4 to terminate. Don't fiddle with compilation-parsing-end.
5
12006-08-28 Chong Yidong <cyd@stupidchicken.com> 62006-08-28 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * emacs-lisp/checkdoc.el (checkdoc-file-comments-engine): Insert 8 * emacs-lisp/checkdoc.el (checkdoc-file-comments-engine):
4 commentary after first line summary. 9 Insert commentary after first line summary.
5 10
6 * woman.el (woman-follow): New function, based on `man-follow'. 11 * woman.el (woman-follow): New function, based on `man-follow'.
7 (woman-mode-map): Use it. 12 (woman-mode-map): Use it.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c38a6e82f83..4821376ec7b 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1373,11 +1373,16 @@ COMMAND should be a single statement."
1373 (let ((end (marker-position (process-mark (python-proc))))) 1373 (let ((end (marker-position (process-mark (python-proc)))))
1374 (with-current-buffer python-buffer (goto-char (point-max))) 1374 (with-current-buffer python-buffer (goto-char (point-max)))
1375 (compilation-forget-errors) 1375 (compilation-forget-errors)
1376 ;; Must wait until this has completed before re-setting variables below. 1376 (python-send-string command)
1377 (python-send-receive (concat command "; print '_emacs_out ()'"))
1378 (with-current-buffer python-buffer 1377 (with-current-buffer python-buffer
1379 (set-marker compilation-parsing-end end) 1378 (setq compilation-last-buffer (current-buffer)))
1380 (setq compilation-last-buffer (current-buffer))))) 1379 ;; No idea what this is for but it breaks the call to
1380 ;; compilation-fake-loc in python-send-region. -- Stef
1381 ;; Must wait until this has completed before re-setting variables below.
1382 ;; (python-send-receive "print '_emacs_out ()'")
1383 ;; (with-current-buffer python-buffer
1384 ;; (set-marker compilation-parsing-end end))
1385 ))
1381 1386
1382(defun python-send-region (start end) 1387(defun python-send-region (start end)
1383 "Send the region to the inferior Python process." 1388 "Send the region to the inferior Python process."