[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 de7644d 1/2: Fix Bug#31704. Do not merge
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-26 de7644d 1/2: Fix Bug#31704. Do not merge |
Date: |
Sat, 29 Dec 2018 05:53:56 -0500 (EST) |
branch: emacs-26
commit de7644d8d8b09fc294fe36ed2162c78a494beccb
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
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)
---
lisp/eshell/esh-proc.el | 7 +++----
lisp/net/tramp.el | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index 94401c5..ee74762 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 5fa9f9a..aa125cd 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"