From b9d0579cd2dc2f79f6b24a2b30123adcd3e3131a Mon Sep 17 00:00:00 2001 From: Daniel Pettersson Date: Tue, 16 Jan 2024 00:28:13 +0100 Subject: [PATCH] Fix relative file display in tramp context Problem is in dape--guess-root which cant decide if it is going to return emacs file paths or adapter file paths (with or without tramp). --- dape.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dape.el b/dape.el index 0c423c16..ea75e857 100644 --- a/dape.el +++ b/dape.el @@ -758,6 +758,8 @@ If PULSE pulse on after opening file." "Guess adapter path root from CONFIG." ;; FIXME We need some property on the adapter telling us how it ;; decided on root + ;; FIXME Is this function meant to return root emacs world (with tramp) + ;; or adapter world w/o tramp? (let ((cwd (plist-get config :cwd)) (command-cwd (plist-get config 'command-cwd))) (cond @@ -864,7 +866,10 @@ If EXTENDED end of line is after newline." (or (and-let* ((parent (dape--parent conn))) (dape--config parent)) (dape--config conn)))) - (root-guess (dape--guess-root config))) + (root-guess (dape--guess-root config)) + ;; Normalize paths for `file-relative-name' + (file (tramp-file-local-name file)) + (root-guess (tramp-file-local-name root-guess))) (concat (string-truncate-left (file-relative-name file root-guess) dape-info-file-name-max)