(gud-common-init): Use absolute file so that

[gnu-emacs] / lisp / progmodes / gud.el

diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index fadeae2e26cf7d45fa9f6d08f9bd1345ca0d144f..f5e6218a432054224c6683ea502cc947b39681f6 100644 (file)
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -889,7 +889,7 @@ It is passed through FILTER before we look at it."
                    (string-match "^#\\([0-9]+\\) +[0-9a-fx]+ in \\([:0-9a-zA-Z_]+\\) (" e)
                    (string-match "^#\\([0-9]+\\) +\\([:0-9a-zA-Z_]+\\) (" e)))
              (if (not (string-match
-                       "at \\([-0-9a-zA-Z_.]+\\):\\([0-9]+\\)$" e))
+                       "at \\([-0-9a-zA-Z_/.]+\\):\\([0-9]+\\)$" e))
                  nil
                (setcar newlst
                        (list (nth 0 (car newlst))
@@ -901,7 +901,7 @@ It is passed through FILTER before we look at it."
            (setq newlst
                  (cons
                   (if (string-match
-                       "at \\([-0-9a-zA-Z_.]+\\):\\([0-9]+\\)$" e)
+                       "at \\([-0-9a-zA-Z_/.]+\\):\\([0-9]+\\)$" e)
                       (list name num (match-string 1 e)
                             (match-string 2 e))
                     (list name num))
@@ -2502,7 +2502,9 @@ comint mode, which see."
       (if w
          (setcar w
                  (if (file-remote-p default-directory)
-                     (setq file (file-name-nondirectory file))
+                     ;; Tramp has already been loaded if we are here.
+                     (setq file (tramp-file-name-localname
+                                 (tramp-dissect-file-name file)))
                    file))))
     (apply 'make-comint (concat "gud" filepart) program nil
           (if massage-args (funcall massage-args file args) args))