From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 13 Jan 2018 16:48:10 +0000 (+0100)
Subject: Fix Bug#29149 in shell.el
X-Git-Tag: emacs-27.0.90~5886
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=45ebf3afc64761af2dfd8712451e893d4c2ddbcc;p=emacs.git

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)
---

diff --git a/lisp/shell.el b/lisp/shell.el
index f046d7830e6..5c228a5eba9 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)))))))