[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 9b2c3c1 1/2: Fix Bug#29149 in shell.el
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-26 9b2c3c1 1/2: Fix Bug#29149 in shell.el |
Date: |
Sun, 14 Jan 2018 04:01:20 -0500 (EST) |
branch: emacs-26
commit 9b2c3c190acb26d7dd7393fed1079a21dd562f6f
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Fix Bug#29149 in shell.el
* lisp/shell.el (shell): Change order of `file-local-name' and
`expand-file-name' calls. Otherwise, the local file name
would be extended by a drive letter, even when it is a remote
file, seen from w32. (Bug#29149)
---
lisp/shell.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/shell.el b/lisp/shell.el
index f046d78..5c228a5 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -727,8 +727,8 @@ Otherwise, one argument `-i' is passed to the shell.
(null explicit-shell-file-name)
(null (getenv "ESHELL")))
(set (make-local-variable 'explicit-shell-file-name)
- (expand-file-name
- (file-local-name
+ (file-local-name
+ (expand-file-name
(read-file-name
"Remote shell path: " default-directory shell-file-name
t shell-file-name)))))))