summaryrefslogtreecommitdiff
path: root/lisp/progmodes/gud.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-06-27 17:38:14 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-06-27 17:38:14 -0400
commita1d3a912e719d47bf06b96a32bbcf570135dc9ce (patch)
tree7b66b64685fab7388679d17618c044f41f8d67ef /lisp/progmodes/gud.el
parent88d3fb11460c94c65b13919aaefec5f5a8f70954 (diff)
downloademacs-a1d3a912e719d47bf06b96a32bbcf570135dc9ce.tar.gz
* lisp/progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653).
Diffstat (limited to 'lisp/progmodes/gud.el')
-rw-r--r--lisp/progmodes/gud.el3
1 files changed, 2 insertions, 1 deletions
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)