diff options
| author | Michael Albinus | 2014-12-24 09:52:18 +0100 |
|---|---|---|
| committer | Michael Albinus | 2014-12-24 09:52:18 +0100 |
| commit | 882370eaa4f7ad6a88396dfdc64f896c727f87f4 (patch) | |
| tree | aaf2d07686c7acad927daa660dfd18c33c793428 | |
| parent | 9db3cdedae422ad8fe9012e16ac3510be15eb77c (diff) | |
| download | emacs-882370eaa4f7ad6a88396dfdc64f896c727f87f4.tar.gz emacs-882370eaa4f7ad6a88396dfdc64f896c727f87f4.zip | |
eshell/esh-ext.el: Expand relative remote file names.
Fixes: debbugs:18782
* eshell/esh-ext.el (eshell-find-interpreter): Expand relative
remote file names.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/eshell/esh-ext.el | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b93d7673f9..0882a519f86 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-12-24 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * eshell/esh-ext.el (eshell-find-interpreter): Expand relative | ||
| 4 | remote file names. (Bug#18782) | ||
| 5 | |||
| 1 | 2014-12-23 Sam Steingold <sds@gnu.org> | 6 | 2014-12-23 Sam Steingold <sds@gnu.org> |
| 2 | 7 | ||
| 3 | * shell.el (shell-display-buffer-actions): New user option. | 8 | * shell.el (shell-display-buffer-actions): New user option. |
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 2654bf21e6a..d7fea47601c 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el | |||
| @@ -296,6 +296,11 @@ line of the form #!<interp>." | |||
| 296 | (let ((fullname (if (file-name-directory file) file | 296 | (let ((fullname (if (file-name-directory file) file |
| 297 | (eshell-search-path file))) | 297 | (eshell-search-path file))) |
| 298 | (suffixes eshell-binary-suffixes)) | 298 | (suffixes eshell-binary-suffixes)) |
| 299 | (if (and fullname | ||
| 300 | (not (file-remote-p fullname)) | ||
| 301 | (file-remote-p default-directory)) | ||
| 302 | (setq fullname (expand-file-name | ||
| 303 | (concat "./" fullname) default-directory))) | ||
| 299 | (if (and fullname (not (or eshell-force-execution | 304 | (if (and fullname (not (or eshell-force-execution |
| 300 | (file-executable-p fullname)))) | 305 | (file-executable-p fullname)))) |
| 301 | (while suffixes | 306 | (while suffixes |