diff options
author | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:12:29 +0000 |
---|---|---|
committer | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:12:29 +0000 |
commit | e18c709364b095ea0be8ecabe458ac9a642a252f (patch) | |
tree | efe814a842f932f387b3947c572bf43a548d17ef /lisp/progmodes/python.el | |
parent | 81088e260b086fe28f36964f32b6338210ec6fd8 (diff) | |
parent | 9f25e707aaad5ed14a9448e9c5d345ff0bdbc5a7 (diff) | |
download | emacs-e18c709364b095ea0be8ecabe458ac9a642a252f.tar.gz |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-660
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-661
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-662
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-663
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-664
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-665
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-666
Fix read-only prompt problem in isearch
* emacs@sv.gnu.org/emacs--devo--0--patch-667
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-668
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-669
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-670
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-671
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-672
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-673
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-206
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-207
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-208
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r-- | lisp/progmodes/python.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 38e846aa2cc..226d4bdc62d 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1150,7 +1150,7 @@ modified by the user. Additional arguments are added when the command is used by `run-python' et al.") (defvar python-buffer nil - "*The current python process buffer. + "*The current Python process buffer. Commands that send text from source buffers to Python processes have to choose a process to send to. This is determined by buffer-local @@ -1383,11 +1383,11 @@ buffer for a list of commands.)" COMMAND should be a single statement." ;; (assert (not (string-match "\n" command))) ;; (let ((end (marker-position (process-mark (python-proc))))) - (with-current-buffer python-buffer (goto-char (point-max))) + (with-current-buffer (process-buffer (python-proc)) + (goto-char (point-max)) (compilation-forget-errors) (python-send-string command) - (with-current-buffer python-buffer - (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. @@ -1517,9 +1517,9 @@ See variable `python-buffer'. Starts a new process if necessary." ;; isn't one for `python-buffer'. (unless (comint-check-proc python-buffer) (run-python nil t)) - (get-buffer-process (or (if (derived-mode-p 'inferior-python-mode) - (current-buffer) - python-buffer)))) + (get-buffer-process (if (derived-mode-p 'inferior-python-mode) + (current-buffer) + python-buffer))) (defun python-set-proc () "Set the default value of `python-buffer' to correspond to this buffer. @@ -2088,7 +2088,7 @@ The default contents correspond to the elements of `python-skeletons'.") > _ \n) (defvar python-default-template "if" - "Default template to expand by `python-insert-template'. + "Default template to expand by `python-expand-template'. Updated on each expansion.") (defun python-expand-template (name) |