auto upstream

2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index d3a11a866c0..ab13d4cf442 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -372,14 +372,14 @@ pass to the OPERATION."
       "ls")))
 
 (defun tramp-adb-get-toolbox (vec)
-  "Get shell toolbox implementation: `toolbox' for orginal distributions
-or `busybox' for CynagenMode based distributions"
+  "Get shell toolbox implementation: `toolbox' for original distributions
+or `busybox' for CyanogenMod based distributions"
   (with-tramp-connection-property vec "toolbox"
     (tramp-message vec 5 "Checking shell toolbox implementation")
     (cond
      ((zerop (tramp-adb-command-exit-status vec "busybox")) 'busybox)
      ((zerop (tramp-adb-command-exit-status vec "toolbox")) 'toolbox)
-     (t 'unkown))))
+     (t 'unknown))))
 
 (defun tramp-adb--gnu-switches-to-ash
   (switches)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f8db03ee4d7..2c4aac0ac8a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3901,7 +3901,12 @@ Only works for Bourne-like shells."
             (with-parsed-tramp-file-name default-directory nil
               (mapconcat
                'identity
-               (tramp-get-connection-property v "remote-path" nil)
+               (or
+                ;; When `tramp-own-remote-path' is in `tramp-remote-path',
+                ;; the remote path is only set in the session cache.
+                (tramp-get-connection-property
+                 (tramp-get-connection-process v) "remote-path" nil)
+                (tramp-get-connection-property v "remote-path" nil))
                ":"))
           (getenv "PATH"))))