diff options
| author | Michael Albinus | 2018-01-13 17:48:10 +0100 |
|---|---|---|
| committer | Michael Albinus | 2018-01-13 17:48:10 +0100 |
| commit | 45ebf3afc64761af2dfd8712451e893d4c2ddbcc (patch) | |
| tree | 894f772450286803f9c6a0f718f1896fdc869775 | |
| parent | 1a5293e724fd1d0d959497931bfd4274df248c38 (diff) | |
| download | emacs-45ebf3afc64761af2dfd8712451e893d4c2ddbcc.tar.gz emacs-45ebf3afc64761af2dfd8712451e893d4c2ddbcc.zip | |
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)
| -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. | |||
| 727 | (null explicit-shell-file-name) | 727 | (null explicit-shell-file-name) |
| 728 | (null (getenv "ESHELL"))) | 728 | (null (getenv "ESHELL"))) |
| 729 | (set (make-local-variable 'explicit-shell-file-name) | 729 | (set (make-local-variable 'explicit-shell-file-name) |
| 730 | (expand-file-name | 730 | (file-local-name |
| 731 | (file-local-name | 731 | (expand-file-name |
| 732 | (read-file-name | 732 | (read-file-name |
| 733 | "Remote shell path: " default-directory shell-file-name | 733 | "Remote shell path: " default-directory shell-file-name |
| 734 | t shell-file-name))))))) | 734 | t shell-file-name))))))) |