Fix Bug#31704. Do not merge

* lisp/eshell/esh-proc.el (eshell-gather-process-output): Do not
let `expand-file-name' prefix remote file names with MS Windows
volume letter.

* lisp/net/tramp.el (tramp-eshell-directory-change):
Use `path-separator' as it does eshell.  (Bug#31704)

diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index 94401c5daa5278bfa50d9d5a65643589687ef481..ee74762193d709052c6dd7a65ac7dab982ff6bc6 100644 (file)
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -279,11 +279,10 @@ See `eshell-needs-pipe'."
            (let ((process-connection-type
                   (unless (eshell-needs-pipe-p command)
                     process-connection-type))
-                 (command (file-local-name command)))
+                 ;; `start-process' can't deal with relative filenames.
+                 (command (file-local-name (expand-file-name command))))
              (apply 'start-file-process
-                    (file-name-nondirectory command) nil
-                    ;; `start-process' can't deal with relative filenames.
-                    (append (list (expand-file-name command)) args))))
+                    (file-name-nondirectory command) nil command args)))
       (eshell-record-process-object proc)
       (set-process-buffer proc (current-buffer))
       (if (eshell-interactive-output-p)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5fa9f9a44d4a20c5e53db1a32581b721ced21f89..aa125cde6d575daf3446240a785d580a290e6846 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4583,7 +4583,7 @@ Only works for Bourne-like shells."
                (tramp-get-connection-property
                 (tramp-get-connection-process v) "remote-path" nil)
                (tramp-get-connection-property v "remote-path" nil))
-              ":"))
+              path-separator))
          (getenv "PATH"))))
 
 (eval-after-load "esh-util"