3 files changed, 12 insertions, 9 deletions
diff --git a/lisp/net/tramp-docker.el b/lisp/net/tramp-docker.el
index 918469908af..12fabfe7ba0 100644
--- a/lisp/net/tramp-docker.el
+++ b/lisp/net/tramp-docker.el
@@ -74,6 +74,9 @@ see its function help for a description of the format."
     (mapcar (lambda (m) (list nil m)) (delq nil names))))
 
 ;;;###tramp-autoload
+(defvar tramp-default-remote-shell) ;; Silence byte compiler.
+
+;;;###tramp-autoload
 (tramp--with-startup
  (push `(,tramp-docker-method
          (tramp-login-program ,tramp-docker-program)
diff --git a/lisp/net/tramp-sshfs.el b/lisp/net/tramp-sshfs.el
index b89e1282d21..3c67fa6ea2f 100644
--- a/lisp/net/tramp-sshfs.el
+++ b/lisp/net/tramp-sshfs.el
@@ -47,6 +47,9 @@
   :type 'string)
 
 ;;;###tramp-autoload
+(defvar tramp-default-remote-shell) ;; Silence byte compiler.
+
+;;;###tramp-autoload
 (tramp--with-startup
  (add-to-list 'tramp-methods
 	      `(,tramp-sshfs-method
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5b60aa6313a..03dc47a053f 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -205,9 +205,9 @@ pair of the form (KEY VALUE).  The following KEYs are defined:
     MUST be a Bourne-like shell.  It is normally not necessary to
     set this to any value other than \"/bin/sh\": Tramp wants to
     use a shell which groks tilde expansion, but it can search
-    for it.  Also note that \"/bin/sh\" exists on all Unixen,
-    this might not be true for the value that you decide to use.
-    You Have Been Warned.
+    for it.  Also note that \"/bin/sh\" exists on all Unixen
+    except Andtoid, this might not be true for the value that you
+    decide to use.  You Have Been Warned.
 
   * `tramp-remote-shell-login'
     This specifies the arguments to let `tramp-remote-shell' run
@@ -278,7 +278,8 @@ pair of the form (KEY VALUE).  The following KEYs are defined:
 
   * `tramp-direct-async'
     Whether the method supports direct asynchronous processes.
-    Until now, just \"ssh\"-based and \"adb\"-based methods do.
+    Until now, just \"ssh\"-based, \"sshfs\"-based and
+    \"adb\"-based methods do.
 
   * `tramp-copy-program'
     This specifies the name of the program to use for remotely copying
@@ -2876,6 +2877,7 @@ remote file names."
   (put #'tramp-completion-file-name-handler 'operations
        (mapcar #'car tramp-completion-file-name-handler-alist))
 
+  ;; Integrated in Emacs 27.
   (when (bound-and-true-p tramp-archive-enabled)
     (add-to-list 'file-name-handler-alist
 	         (cons tramp-archive-file-name-regexp
@@ -6124,11 +6126,6 @@ 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"))))