aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2019-12-18 10:19:19 +0100
committerMichael Albinus2019-12-18 10:19:19 +0100
commit0a10795d0bf4fe21997f907b7d6b1fe13517912b (patch)
tree701168da76f2c01d6a78b9dab8058a8800cca703
parent6008b679f65f8377a1a1b4601024ac83df013caf (diff)
downloademacs-0a10795d0bf4fe21997f907b7d6b1fe13517912b.tar.gz
emacs-0a10795d0bf4fe21997f907b7d6b1fe13517912b.zip
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)
-rw-r--r--lisp/progmodes/compile.el16
1 files changed, 5 insertions, 11 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3fbd6eb2c75..197d52b2dea 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2936,21 +2936,15 @@ TRUE-DIRNAME is the `file-truename' of DIRNAME, if given."
2936 ;; Let's normalize it and look again. 2936 ;; Let's normalize it and look again.
2937 (let ((filename (car file)) 2937 (let ((filename (car file))
2938 ;; Get the specified directory from FILE. 2938 ;; Get the specified directory from FILE.
2939 (spec-directory (if (cdr file) 2939 (spec-directory
2940 (file-truename (cdr file))))) 2940 (if (cdr file)
2941 (file-truename (concat comint-file-name-prefix (cdr file))))))
2941 2942
2942 ;; Check for a comint-file-name-prefix and prepend it if appropriate. 2943 ;; Check for a comint-file-name-prefix and prepend it if appropriate.
2943 ;; (This is very useful for compilation-minor-mode in an rlogin-mode 2944 ;; (This is very useful for compilation-minor-mode in an rlogin-mode
2944 ;; buffer.) 2945 ;; buffer.)
2945 (when (and (boundp 'comint-file-name-prefix) 2946 (if (file-name-absolute-p filename)
2946 (not (equal comint-file-name-prefix ""))) 2947 (setq filename (concat comint-file-name-prefix filename)))
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))))))
2954 2948
2955 ;; If compilation-parse-errors-filename-function is 2949 ;; If compilation-parse-errors-filename-function is
2956 ;; defined, use it to process the filename. The result might be a 2950 ;; defined, use it to process the filename. The result might be a