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'.

diff --git a/lisp/net/tramp-fuse.el b/lisp/net/tramp-fuse.el
index 5c0bb8e8d96ed8c4df3a806e79f62a608797297b..8626610211ad55f42c258f19391d6994b548a12a 100644 (file)
--- 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 0b3ce07d275b962e11148dfb2169bf0c77a910dd..25a26d67d6d784c71697ecc123b3b3de3592b2a8 100644 (file)
--- 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))