More ME patches:
(py-shell): Recognize the Python debugger prompt
(py-jump-to-exception): Force into python-mode any buffer that gets
jumped to on exception. Cope with py-exception-buffer possibly a
cons.
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index a9df6e7..1cb3dba 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -1252,7 +1252,7 @@
(switch-to-buffer-other-window
(apply 'make-comint py-which-bufname py-which-shell nil py-which-args))
(make-local-variable 'comint-prompt-regexp)
- (setq comint-prompt-regexp "^>>> \\|^[.][.][.] ")
+ (setq comint-prompt-regexp "^>>> \\|^[.][.][.] \\|^(pdb) ")
(set-process-filter (get-buffer-process (current-buffer)) 'py-process-filter)
(set-syntax-table py-mode-syntax-table)
;; set up keybindings for this subshell
@@ -1354,7 +1354,9 @@
(defun py-jump-to-exception (file line)
(let ((buffer (cond ((string-equal file "<stdin>")
- py-exception-buffer)
+ (if (consp py-exception-buffer)
+ (cdr py-exception-buffer)
+ py-exception-buffer))
((and (consp py-exception-buffer)
(string-equal file (car py-exception-buffer)))
(cdr py-exception-buffer))
@@ -1365,6 +1367,9 @@
nil
file t))))))
(pop-to-buffer buffer)
+ ;; Force Python mode
+ (if (not (eq major-mode) 'python-mode)
+ (python-mode))
(goto-line line)
(message "Jumping to exception in file %s on line %d" file line)))