[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100605: * lisp/progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653).

[Chong Yidong]

------------------------------------------------------------
revno: 100605
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-06-27 17:38:14 -0400
message:
  * lisp/progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653).
modified:
  lisp/ChangeLog
  lisp/progmodes/gud.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-27 21:16:28 +0000
+++ b/lisp/ChangeLog    2011-06-27 21:38:14 +0000
@@ -1,3 +1,7 @@
+2011-06-27  Markus Heiser  <address@hidden>
+
+       * progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653).
+
 2011-06-27  Jambunathan K  <address@hidden>
 
        * tar-mode.el (tar-untar-buffer): Set coding-system-for-write to

=== modified file 'lisp/progmodes/gud.el'
--- a/lisp/progmodes/gud.el     2011-01-02 23:50:46 +0000
+++ b/lisp/progmodes/gud.el     2011-06-27 21:38:14 +0000
@@ -1595,7 +1595,8 @@
 ;; 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)