From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 27 Jun 2011 21:38:14 +0000 (-0400)
Subject: * lisp/progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653).
X-Git-Tag: emacs-pretest-24.0.90~104^3~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1d3a912e719d47bf06b96a32bbcf570135dc9ce;p=emacs.git

* lisp/progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653).
---

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)