Skip to content

Commit 0a10795

Browse files
committed
Fix an error with remote file name in compile.el
* lisp/progmodes/compile.el (compilation-get-file-structure): Compute proper remote file name. (Bug#38648)
1 parent 6008b67 commit 0a10795

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

lisp/progmodes/compile.el

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2936,21 +2936,15 @@ TRUE-DIRNAME is the `file-truename' of DIRNAME, if given."
29362936
;; Let's normalize it and look again.
29372937
(let ((filename (car file))
29382938
;; Get the specified directory from FILE.
2939-
(spec-directory (if (cdr file)
2940-
(file-truename (cdr file)))))
2939+
(spec-directory
2940+
(if (cdr file)
2941+
(file-truename (concat comint-file-name-prefix (cdr file))))))
29412942

29422943
;; Check for a comint-file-name-prefix and prepend it if appropriate.
29432944
;; (This is very useful for compilation-minor-mode in an rlogin-mode
29442945
;; buffer.)
2945-
(when (and (boundp 'comint-file-name-prefix)
2946-
(not (equal comint-file-name-prefix "")))
2947-
(if (file-name-absolute-p filename)
2948-
(setq filename
2949-
(concat comint-file-name-prefix filename))
2950-
(if spec-directory
2951-
(setq spec-directory
2952-
(file-truename
2953-
(concat comint-file-name-prefix spec-directory))))))
2946+
(if (file-name-absolute-p filename)
2947+
(setq filename (concat comint-file-name-prefix filename)))
29542948

29552949
;; If compilation-parse-errors-filename-function is
29562950
;; defined, use it to process the filename. The result might be a

0 commit comments

Comments
 (0)