diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 9 | ||||
-rw-r--r-- | lisp/progmodes/python.el | 13 |
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 @@ +2006-08-28 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/python.el (python-send-command): Don't wait for the command + to terminate. Don't fiddle with compilation-parsing-end. + 2006-08-28 Chong Yidong <cyd@stupidchicken.com> - * emacs-lisp/checkdoc.el (checkdoc-file-comments-engine): Insert - commentary after first line summary. + * emacs-lisp/checkdoc.el (checkdoc-file-comments-engine): + Insert commentary after first line summary. * woman.el (woman-follow): New function, based on `man-follow'. (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." (let ((end (marker-position (process-mark (python-proc))))) (with-current-buffer python-buffer (goto-char (point-max))) (compilation-forget-errors) - ;; Must wait until this has completed before re-setting variables below. - (python-send-receive (concat command "; print '_emacs_out ()'")) + (python-send-string command) (with-current-buffer python-buffer - (set-marker compilation-parsing-end end) - (setq compilation-last-buffer (current-buffer))))) + (setq compilation-last-buffer (current-buffer))) + ;; No idea what this is for but it breaks the call to + ;; compilation-fake-loc in python-send-region. -- Stef + ;; Must wait until this has completed before re-setting variables below. + ;; (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." |