Skip to content

Commit 6579261

Browse files
authored
Merge pull request #1739 from juergenhoetzel/tramp-support
Make sure that a local file name is used in compile commands
2 parents 20f72cc + 896f72e commit 6579261

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

haskell-compile.el

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,24 +219,25 @@ base directory for build tools, or the current buffer for
219219
;; called only by (haskell-compile):
220220
(defun haskell--compile (dir-or-file edit last-sym fallback alt)
221221
(let* ((dir-or-file (or dir-or-file default-directory))
222+
(local-dir-or-file (or (file-remote-p dir-or-file 'localname) dir-or-file))
222223
(last-pair (symbol-value last-sym))
223224
(last-command (car last-pair))
224225
(last-dir (cdr last-pair))
225-
(default (or (and last-dir (eq last-dir dir-or-file) last-command)
226+
(default (or (and last-dir (eq last-dir local-dir-or-file) last-command)
226227
fallback))
227228
(template (cond
228229
((null edit) default)
229230
((eq edit '-) alt)
230231
(t (compilation-read-command default))))
231-
(command (format template dir-or-file))
232-
(dir (if (directory-name-p dir-or-file)
233-
dir-or-file
232+
(command (format template local-dir-or-file))
233+
(dir (if (directory-name-p local-dir-or-file)
234+
local-dir-or-file
234235
default-directory))
235-
(name (if (directory-name-p dir-or-file)
236-
(file-name-base (directory-file-name dir-or-file))
237-
(file-name-nondirectory dir-or-file))))
236+
(name (if (directory-name-p local-dir-or-file)
237+
(file-name-base (directory-file-name local-dir-or-file))
238+
(file-name-nondirectory local-dir-or-file))))
238239
(unless (eq edit'-)
239-
(set last-sym (cons template dir-or-file)))
240+
(set last-sym (cons template local-dir-or-file)))
240241
(let ((default-directory dir))
241242
(compilation-start
242243
command

0 commit comments

Comments
 (0)