diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2018-01-13 17:48:10 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2018-01-13 17:48:10 +0100 |
| commit | 45ebf3afc64761af2dfd8712451e893d4c2ddbcc (patch) | |
| tree | 894f772450286803f9c6a0f718f1896fdc869775 /lisp/shell.el | |
| parent | 1a5293e724fd1d0d959497931bfd4274df248c38 (diff) | |
| download | emacs-45ebf3afc64761af2dfd8712451e893d4c2ddbcc.tar.gz | |
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)
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 4 |
1 files changed, 2 insertions, 2 deletions
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))))))) |