From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 6 Sep 2018 10:16:00 +0000 (+0200)
Subject: Fix Bug#31704.  Do not merge
X-Git-Tag: emacs-26.1.91~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de7644d8d8b09fc294fe36ed2162c78a494beccb;p=emacs.git

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 94401c5daa5..ee74762193d 100644
--- 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 5fa9f9a44d4..aa125cde6d5 100644
--- 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"