[Emacs-diffs] trunk r115500: * lisp/progmodes/python.el (python-pdbtrack-stacktrace-info-regexp):

[Fabián Ezequiel Gallina]

------------------------------------------------------------
revno: 115500
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15378
committer: Fabián Ezequiel Gallina <address@hidden>
branch nick: trunk
timestamp: Thu 2013-12-12 21:56:12 -0300
message:
  * lisp/progmodes/python.el (python-pdbtrack-stacktrace-info-regexp):
  Also match after beginning of line.
  (python-pdbtrack-set-tracked-buffer): Fix logic for remote
  files.  Thanks to Russell Sim.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/python.el       python.el-20091113204419-o5vbwnq5f7feedwu-3008

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-13 00:47:18 +0000
+++ b/lisp/ChangeLog    2013-12-13 00:56:12 +0000
@@ -1,3 +1,10 @@
+2013-12-13  Fabián Ezequiel Gallina  <address@hidden>
+
+       * progmodes/python.el (python-pdbtrack-stacktrace-info-regexp):
+       Also match after beginning of line.
+       (python-pdbtrack-set-tracked-buffer): Fix logic for remote
+       files.  Thanks to Russell Sim. (Bug#15378)
+
 2013-12-13  Juri Linkov  <address@hidden>
 
        * comint.el (comint-mode-map): Replace `delete-char' with

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2013-12-12 23:32:05 +0000
+++ b/lisp/progmodes/python.el  2013-12-13 00:56:12 +0000
@@ -2482,7 +2482,7 @@
   :safe 'booleanp)
 
 (defcustom python-pdbtrack-stacktrace-info-regexp
-  "^> \\([^\"(<]+\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()"
+  "> \\([^\"(<]+\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()"
   "Regular Expression matching stacktrace information.
 Used to extract the current line and module being inspected."
   :type 'string
@@ -2501,7 +2501,9 @@
   "Set the buffer for FILE-NAME as the tracked buffer.
 Internally it uses the `python-pdbtrack-tracked-buffer' variable.
 Returns the tracked buffer."
-  (let ((file-buffer (get-file-buffer file-name)))
+  (let ((file-buffer (get-file-buffer
+                      (concat (file-remote-p default-directory)
+                              file-name))))
     (if file-buffer
         (setq python-pdbtrack-tracked-buffer file-buffer)
       (setq file-buffer (find-file-noselect file-name))