summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-02-26 19:19:50 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-02-26 19:19:50 -0500
commitb8280f393023247c6cb21e7546fc9edd891fb711 (patch)
tree54e4754c03386b2298577eb50143b0174e6baf8b
parentdcfb7b5c8529e9cf790d121e41127017dd0476dd (diff)
downloademacs-b8280f393023247c6cb21e7546fc9edd891fb711.tar.gz
Minor Python mode fix (Bug#5653).
* progmodes/python.el (python-pdbtrack-stack-entry-regexp): Allow the characters _<> in the stack entry (Bug#5653).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/python.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 434e3aab619..1eb01818750 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-27 Jeremy Whitlock <jcscoobyrs@gmail.com> (tiny change)
+
+ * progmodes/python.el (python-pdbtrack-stack-entry-regexp): Allow
+ the characters _<> in the stack entry (Bug#5653).
+
2010-02-26 Kenichi Handa <handa@m17n.org>
* language/burmese.el: Fix entries in composition-function-table.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a6354eff998..4e0f326e2d4 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -576,7 +576,7 @@ Currently-active file is at the head of the list.")
(defvar python-pdbtrack-is-tracking-p nil)
(defconst python-pdbtrack-stack-entry-regexp
- "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_]+\\)()"
+ "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()"
"Regular expression pdbtrack uses to find a stack trace entry.")
(defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ "