diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2021-09-21 20:26:59 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2021-09-21 20:26:59 +0200 |
| commit | 2e5752cf981bd9672630db2d66a032c6607fe1a7 (patch) | |
| tree | 67be07b0531db1b236a8470cde340e2cb00d49e8 /lisp/net/tramp-crypt.el | |
| parent | b2bb717d4b539b80841096609321d0c0b43576d0 (diff) | |
| download | emacs-2e5752cf981bd9672630db2d66a032c6607fe1a7.tar.gz emacs-2e5752cf981bd9672630db2d66a032c6607fe1a7.tar.bz2 emacs-2e5752cf981bd9672630db2d66a032c6607fe1a7.zip | |
Fix tramp-compat-temporary-file-directory implementation
* lisp/net/tramp-archive.el
(tramp-archive-handle-temporary-file-directory):
Use `tramp-compat-temporary-file-directory-function'.
* lisp/net/tramp-compat.el (tramp-compat-temporary-file-directory):
Make it a defconst.
* lisp/net/tramp.el (tramp-get-debug-buffer, tramp-get-debug-file-name)
(tramp-debug-message, tramp-file-name-handler, tramp-parse-file)
(tramp-parse-shostkeys-sknownhosts)
(tramp-handle-expand-file-name, tramp-handle-make-process)
(tramp-local-host-p, tramp-call-process)
(tramp-call-process-region, tramp-process-lines)
(tramp-read-passwd):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-compat.el (tramp-compat-make-temp-name)
(tramp-compat-make-temp-file);
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-for-operation)
(tramp-crypt-maybe-open-connection, tramp-crypt-send-command)
(tramp-crypt-do-encrypt-or-decrypt-file-name):
* lisp/net/tramp-fuse.el (tramp-fuse-mount-point, tramp-fuse-mounted-p)
(tramp-fuse-unmount):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-sh-handle-expand-file-name)
(tramp-sh-handle-file-local-copy, )
(tramp-sh-handle-write-region, tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): Use it.
Diffstat (limited to 'lisp/net/tramp-crypt.el')
| -rw-r--r-- | lisp/net/tramp-crypt.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/net/tramp-crypt.el b/lisp/net/tramp-crypt.el index 5f86767ef94..5def3a4137c 100644 --- a/lisp/net/tramp-crypt.el +++ b/lisp/net/tramp-crypt.el @@ -247,7 +247,7 @@ Operations not mentioned here will be handled by the default Emacs primitives.") (unless (tramp-crypt-file-name-p tfnfo) (setq tfnfo (apply #'tramp-file-name-for-operation operation - (cons (tramp-compat-temporary-file-directory) (cdr args))))) + (cons tramp-compat-temporary-file-directory (cdr args))))) tfnfo)) (defun tramp-crypt-run-real-handler (operation args) @@ -329,7 +329,7 @@ connection if a previous connection has died for some reason." (copy-file remote-config local-config 'ok 'keep) ;; Create local encfs6 config file otherwise. - (let* ((default-directory (tramp-compat-temporary-file-directory)) + (let* ((default-directory tramp-compat-temporary-file-directory) (tmpdir1 (file-name-as-directory (tramp-compat-make-temp-file " .crypt" 'dir-flag))) (tmpdir2 (file-name-as-directory @@ -383,7 +383,7 @@ ARGS are the arguments. It returns t if ran successful, and nil otherwise." (with-temp-buffer (let* (;; Don't check for a proper method. (non-essential t) - (default-directory (tramp-compat-temporary-file-directory)) + (default-directory tramp-compat-temporary-file-directory) ;; We cannot add it to `process-environment', because ;; `tramp-call-process-region' doesn't use it. (encfs-config @@ -427,7 +427,7 @@ Otherwise, return NAME." crypt-vec localname (concat (symbol-name op) "-file-name") (unless (tramp-crypt-send-command crypt-vec (if (eq op 'encrypt) "encode" "decode") - (tramp-compat-temporary-file-directory) localname) + tramp-compat-temporary-file-directory localname) (tramp-error crypt-vec 'file-error "%s of file name %s failed." (if (eq op 'encrypt) "Encoding" "Decoding") name)) |