diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-10-01 17:14:47 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-10-01 17:14:47 +0200 |
| commit | abe83f76de36bc3922b410f9872065fc3903738b (patch) | |
| tree | a6133bd943743563787f5504122aef5dcb3a4ddc /lisp/net | |
| parent | ced37a87e73e6450b554d5a5db2b451aec70fafe (diff) | |
| parent | be3eac3929c96d9ba340ef362cc1146b0b487f1f (diff) | |
| download | emacs-abe83f76de36bc3922b410f9872065fc3903738b.tar.gz emacs-abe83f76de36bc3922b410f9872065fc3903738b.tar.bz2 emacs-abe83f76de36bc3922b410f9872065fc3903738b.zip | |
Merge from origin/emacs-28
be3eac3929 ; * etc/NEWS: Fix typos.
99a8c53247 Fix connection property incompatibility in Tramp
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 55c7cd5f37d..373392f7c84 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -6124,6 +6124,11 @@ This handles also chrooted environments, which are not regarded as local." (defun tramp-get-remote-tmpdir (vec) "Return directory for temporary files on the remote host identified by VEC." (with-tramp-connection-property (tramp-get-process vec) "remote-tmpdir" + ;; Prior Tramp 2.5.3.2, the connection property "tmpdir" did exist + ;; with a remote file name. This must be discarded. (Bug#57800) + (when-let ((tmpdir (tramp-get-connection-property vec "tmpdir" nil))) + (when (tramp-tramp-file-p tmpdir) + (tramp-flush-connection-property vec "tmpdir"))) (let ((dir (tramp-make-tramp-file-name vec (or (tramp-get-method-parameter vec 'tramp-tmpdir) "/tmp")))) |