diff options
| author | Eli Zaretskii | 2010-02-27 07:43:30 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-02-27 07:43:30 -0500 |
| commit | d23cd5eeb2993e55943d250ea8c2015da5b06a24 (patch) | |
| tree | 2b3eac653fd6869f83179e393a467d81f6421cf9 /lisp/progmodes/python.el | |
| parent | 918f41599dfab54071920441d86c306ced83b550 (diff) | |
| parent | 8ff35869753b7ef1bd479d99fe685a47fa6b73ed (diff) | |
| download | emacs-d23cd5eeb2993e55943d250ea8c2015da5b06a24.tar.gz emacs-d23cd5eeb2993e55943d250ea8c2015da5b06a24.zip | |
Merge frome mainline.
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
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.") | |||
| 576 | (defvar python-pdbtrack-is-tracking-p nil) | 576 | (defvar python-pdbtrack-is-tracking-p nil) |
| 577 | 577 | ||
| 578 | (defconst python-pdbtrack-stack-entry-regexp | 578 | (defconst python-pdbtrack-stack-entry-regexp |
| 579 | "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_]+\\)()" | 579 | "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()" |
| 580 | "Regular expression pdbtrack uses to find a stack trace entry.") | 580 | "Regular expression pdbtrack uses to find a stack trace entry.") |
| 581 | 581 | ||
| 582 | (defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ " | 582 | (defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ " |