changeset 108424:a8944be1e493

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sat, 27 Feb 2010 00:41:17 +0000
parents 1ee7f5caa71f (current diff) 8953c1cd8568 (diff)
children 09e9c8115173
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Feb 26 14:26:02 2010 +0000
+++ b/lisp/ChangeLog	Sat Feb 27 00:41:17 2010 +0000
@@ -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.
--- a/lisp/progmodes/python.el	Fri Feb 26 14:26:02 2010 +0000
+++ b/lisp/progmodes/python.el	Sat Feb 27 00:41:17 2010 +0000
@@ -576,7 +576,7 @@
 (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[>)]+ "