From e3987d7e1a1993eb5ff0ac10b2cffcb92dd2a00c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 24 May 2023 20:52:25 +0200 Subject: [PATCH] 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'. --- lisp/net/tramp-fuse.el | 3 ++- lisp/net/tramp-sh.el | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/net/tramp-fuse.el b/lisp/net/tramp-fuse.el index 5c0bb8e8d96..8626610211a 100644 --- a/lisp/net/tramp-fuse.el +++ b/lisp/net/tramp-fuse.el @@ -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) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 0b3ce07d275..25a26d67d6d 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -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)) -- 2.39.2