[elpa] externals/tramp 12745adb73: Tramp ELPA version 2.5.4 released

[ELPA Syncer]

branch: externals/tramp
commit 12745adb7381cce671fc707946331b561e0cb372
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Tramp ELPA version 2.5.4 released
---
 README             | 4 ++--
 texi/trampver.texi | 2 +-
 tramp.el           | 5 +++++
 trampver.el        | 6 +++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 9a93daa14a..1b8f5f77b0 100644
--- a/README
+++ b/README
@@ -22,11 +22,11 @@ installed with, you must recompile the package:
 
    * Remove all byte-compiled Tramp files
 
-          $ rm -f ~/.emacs.d/elpa/tramp-2.5.3.3/tramp*.elc
+          $ rm -f ~/.emacs.d/elpa/tramp-2.5.4/tramp*.elc
 
    * Start Emacs with Tramp's source files
 
-          $ emacs -L ~/.emacs.d/elpa/tramp-2.5.3.3 -l tramp
+          $ emacs -L ~/.emacs.d/elpa/tramp-2.5.4 -l tramp
 
      This should not give you the error.
 
diff --git a/texi/trampver.texi b/texi/trampver.texi
index ac7d6c01d2..32419878be 100644
--- a/texi/trampver.texi
+++ b/texi/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp GIT, the version numbers are auto-frobbed from
 @c tramp.el, and the bug report address is auto-frobbed from
 @c configure.ac.
-@set trampver 2.5.3.3
+@set trampver 2.5.4
 @set trampurl https://www.gnu.org/software/tramp/
 @set tramp-bug-report-address tramp-devel@@gnu.org
 @set emacsver 25.1
diff --git a/tramp.el b/tramp.el
index f7243625c7..91dfb5c3c8 100644
--- a/tramp.el
+++ b/tramp.el
@@ -5459,6 +5459,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"))))
diff --git a/trampver.el b/trampver.el
index f82bc6a15f..6567dea966 100644
--- a/trampver.el
+++ b/trampver.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.5.3.3
+;; Version: 2.5.4
 ;; Package-Requires: ((emacs "25.1"))
 ;; Package-Type: multi
 ;; URL: https://www.gnu.org/software/tramp/
@@ -40,7 +40,7 @@
 ;; ./configure" to change them.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.5.3.3"
+(defconst tramp-version "2.5.4"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -78,7 +78,7 @@
 ;; Check for Emacs version.
 (let ((x   (if (not (string-lessp emacs-version "25.1"))
       "ok"
-    (format "Tramp 2.5.3.3 is not fit for %s"
+    (format "Tramp 2.5.4 is not fit for %s"
             (replace-regexp-in-string "\n" "" (emacs-version))))))
   (unless (string-equal "ok" x) (error "%s" x)))