diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-06-27 17:38:14 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-06-27 17:38:14 -0400 |
| commit | a1d3a912e719d47bf06b96a32bbcf570135dc9ce (patch) | |
| tree | 7b66b64685fab7388679d17618c044f41f8d67ef /lisp | |
| parent | 88d3fb11460c94c65b13919aaefec5f5a8f70954 (diff) | |
| download | emacs-a1d3a912e719d47bf06b96a32bbcf570135dc9ce.tar.gz | |
* lisp/progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/gud.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e91bb059d60..b13d321cc54 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-06-27 Markus Heiser <markus.heiser@darmarit.de> + + * progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653). + 2011-06-27 Jambunathan K <kjambunathan@gmail.com> * tar-mode.el (tar-untar-buffer): Set coding-system-for-write to diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 17e2143e041..9db36f7727d 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1595,7 +1595,8 @@ and source-file directory for your debugger." ;; Last group is for return value, e.g. "> test.py(2)foo()->None" ;; Either file or function name may be omitted: "> <string>(0)?()" (defvar gud-pdb-marker-regexp - "^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\|<module>\\)()\\(->[^\n]*\\)?\n") + "^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\|<module>\\)()\\(->[^\n\r]*\\)?[\n\r]") + (defvar gud-pdb-marker-regexp-file-group 1) (defvar gud-pdb-marker-regexp-line-group 2) (defvar gud-pdb-marker-regexp-fnname-group 3) |