From ce030451728326b438faae611f6d6e95ac8b82de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Thu, 12 Dec 2013 21:56:12 -0300 Subject: [PATCH] * 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. Fixes: debbugs:15378 --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/python.el | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 805db12de4a..89293a8a03d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2013-12-13 Fabián Ezequiel Gallina + + * 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 * comint.el (comint-mode-map): Replace `delete-char' with diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 8de1717096f..aeee179c7e7 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2482,7 +2482,7 @@ to complete." :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 @@ Never set this variable directly, use "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)) -- 2.39.2