# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1267231277 0
# Node ID a8944be1e493c661b93c8c92100e93804075fc50
# Parent  1ee7f5caa71f6366d2670d07b8ee8d9d1f60c30e# Parent  8953c1cd85689c2b569cac4afd29508b7ec1f5eb
Merge from mainline.

diff -r 1ee7f5caa71f -r a8944be1e493 lisp/ChangeLog
--- 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.
diff -r 1ee7f5caa71f -r a8944be1e493 lisp/progmodes/python.el
--- 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[>)]+ "