aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorKen Manheimer2011-11-16 11:37:48 -0500
committerKen Manheimer2011-11-16 11:37:48 -0500
commit8642c2163e9b0dfcf2aa4e0a6a7850b322faddc0 (patch)
tree2abe503327cba2f5e1f24ecba17acb1dc4251737 /lisp/progmodes/python.el
parent58179ccebd1c2fd18fa422a7bb4d2cf78994e3c9 (diff)
downloademacs-8642c2163e9b0dfcf2aa4e0a6a7850b322faddc0.tar.gz
emacs-8642c2163e9b0dfcf2aa4e0a6a7850b322faddc0.zip
* python.el (python-pdbtrack-stack-entry-regexp)
(python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file): Adjust to recognize ipdb as well as regular python pdb prompts. Adjustments shamelessly taken exactly as suggested in EmacsWiki page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8615400bf6a..fe6bab0160d 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -550,7 +550,7 @@ element matches `python-python-command'."
550 "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()" 550 "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()"
551 "Regular expression pdbtrack uses to find a stack trace entry.") 551 "Regular expression pdbtrack uses to find a stack trace entry.")
552 552
553(defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ " 553(defconst python-pdbtrack-input-prompt "\n[(<]*[Ii]?[Pp]db[>)]+ "
554 "Regular expression pdbtrack uses to recognize a pdb prompt.") 554 "Regular expression pdbtrack uses to recognize a pdb prompt.")
555 555
556(defconst python-pdbtrack-track-range 10000 556(defconst python-pdbtrack-track-range 10000
@@ -2583,6 +2583,7 @@ find it."
2583 (if (not (string-match (concat python-pdbtrack-input-prompt "$") block)) 2583 (if (not (string-match (concat python-pdbtrack-input-prompt "$") block))
2584 (python-pdbtrack-overlay-arrow nil) 2584 (python-pdbtrack-overlay-arrow nil)
2585 2585
2586 (setq block (ansi-color-filter-apply block))
2586 (setq target (python-pdbtrack-get-source-buffer block)) 2587 (setq target (python-pdbtrack-get-source-buffer block))
2587 2588
2588 (if (stringp target) 2589 (if (stringp target)