1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Fix problem in Tramp running two async processes in parallel

* lisp/net/tramp-integration.el
(tramp-compile-disable-ssh-controlmaster-options): New defun.  Add
it to `compilation-mode-hook'.  (Bug#45518)

* lisp/progmodes/compile.el (compilation-get-file-structure):
Revert commit 4ce5646d59, it isn't needed.
This commit is contained in:
Michael Albinus 2021-03-16 18:39:51 +01:00
parent 9b8a6b917b
commit 6c60ecd2d6
2 changed files with 20 additions and 8 deletions

View file

@ -3040,12 +3040,7 @@ TRUE-DIRNAME is the `file-truename' of DIRNAME, if given."
;; Get the specified directory from FILE.
(spec-directory
(if (cdr file)
;; This function is active in `compilation-filter'.
;; There could be problems to call `file-truename'
;; for remote compilation processes.
(if (file-remote-p default-directory)
(concat comint-file-name-prefix (cdr file))
(file-truename (concat comint-file-name-prefix (cdr file)))))))
(file-truename (concat comint-file-name-prefix (cdr file))))))
;; Check for a comint-file-name-prefix and prepend it if appropriate.
;; (This is very useful for compilation-minor-mode in an rlogin-mode