Use `small-temporary-file-directory' in Tramp
* lisp/net/tramp-fuse.el (tramp-fuse-mount-point): * lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Use `small-temporary-file-directory'.
This commit is contained in:
parent
b2b2be98da
commit
e3987d7e1a
2 changed files with 7 additions and 3 deletions
|
@ -149,7 +149,8 @@
|
|||
(when (tramp-file-name-user vec)
|
||||
(concat (tramp-file-name-user-domain vec) "@"))
|
||||
(tramp-file-name-host-port vec))
|
||||
tramp-compat-temporary-file-directory)))
|
||||
(or small-temporary-file-directory
|
||||
tramp-compat-temporary-file-directory))))
|
||||
|
||||
(defconst tramp-fuse-mount-timeout
|
||||
(eval (car (get 'remote-file-name-inhibit-cache 'standard-value)) t)
|
||||
|
|
|
@ -4867,8 +4867,11 @@ Goes through the list `tramp-inline-compress-commands'."
|
|||
(if (eq tramp-use-connection-share 'suppress)
|
||||
"none"
|
||||
;; Hashed tokens are introduced in OpenSSH 6.7.
|
||||
(if (tramp-ssh-option-exists-p vec "ControlPath=tramp.%C")
|
||||
"tramp.%%C" "tramp.%%r@%%h:%%p"))
|
||||
(expand-file-name
|
||||
(if (tramp-ssh-option-exists-p vec "ControlPath=tramp.%C")
|
||||
"tramp.%%C" "tramp.%%r@%%h:%%p")
|
||||
(or small-temporary-file-directory
|
||||
tramp-compat-temporary-file-directory)))
|
||||
|
||||
;; ControlPersist option is introduced in OpenSSH 5.6.
|
||||
(when (and (not (eq tramp-use-connection-share 'suppress))
|
||||
|
|
Loading…
Add table
Reference in a new issue