diff options
| author | Fabián Ezequiel Gallina | 2013-12-12 21:56:12 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2013-12-12 21:56:12 -0300 |
| commit | ce030451728326b438faae611f6d6e95ac8b82de (patch) | |
| tree | 1c6934e173b59433b6954aa1c3c6a131dbf47a8b /lisp/progmodes/python.el | |
| parent | a3fab1ec17f05e2782dcde814018fc48a3bbebb9 (diff) | |
| download | emacs-ce030451728326b438faae611f6d6e95ac8b82de.tar.gz emacs-ce030451728326b438faae611f6d6e95ac8b82de.zip | |
* 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
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 6 |
1 files changed, 4 insertions, 2 deletions
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." | |||
| 2482 | :safe 'booleanp) | 2482 | :safe 'booleanp) |
| 2483 | 2483 | ||
| 2484 | (defcustom python-pdbtrack-stacktrace-info-regexp | 2484 | (defcustom python-pdbtrack-stacktrace-info-regexp |
| 2485 | "^> \\([^\"(<]+\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()" | 2485 | "> \\([^\"(<]+\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()" |
| 2486 | "Regular Expression matching stacktrace information. | 2486 | "Regular Expression matching stacktrace information. |
| 2487 | Used to extract the current line and module being inspected." | 2487 | Used to extract the current line and module being inspected." |
| 2488 | :type 'string | 2488 | :type 'string |
| @@ -2501,7 +2501,9 @@ Never set this variable directly, use | |||
| 2501 | "Set the buffer for FILE-NAME as the tracked buffer. | 2501 | "Set the buffer for FILE-NAME as the tracked buffer. |
| 2502 | Internally it uses the `python-pdbtrack-tracked-buffer' variable. | 2502 | Internally it uses the `python-pdbtrack-tracked-buffer' variable. |
| 2503 | Returns the tracked buffer." | 2503 | Returns the tracked buffer." |
| 2504 | (let ((file-buffer (get-file-buffer file-name))) | 2504 | (let ((file-buffer (get-file-buffer |
| 2505 | (concat (file-remote-p default-directory) | ||
| 2506 | file-name)))) | ||
| 2505 | (if file-buffer | 2507 | (if file-buffer |
| 2506 | (setq python-pdbtrack-tracked-buffer file-buffer) | 2508 | (setq python-pdbtrack-tracked-buffer file-buffer) |
| 2507 | (setq file-buffer (find-file-noselect file-name)) | 2509 | (setq file-buffer (find-file-noselect file-name)) |