diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2017-06-07 18:48:39 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2017-06-11 07:39:40 -0400 |
| commit | cf557fa9c53bb8795ddc744319e067515a9dba67 (patch) | |
| tree | 3a2f29c2ec716064bedc60031280aefbab83ad7d /lisp/eshell/esh-ext.el | |
| parent | 517a0394d2ba15b517e2a2b7384a7cc98b11b80d (diff) | |
| download | emacs-cf557fa9c53bb8795ddc744319e067515a9dba67.tar.gz emacs-cf557fa9c53bb8795ddc744319e067515a9dba67.tar.bz2 emacs-cf557fa9c53bb8795ddc744319e067515a9dba67.zip | |
Let eshell/sudo handle absolute command names (Bug#27167)
* lisp/eshell/esh-ext.el (eshell-find-interpreter): Don't change
absolute paths into relative ones.
Diffstat (limited to 'lisp/eshell/esh-ext.el')
| -rw-r--r-- | lisp/eshell/esh-ext.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index fb1fedc9c54..2a495225dc2 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -299,11 +299,13 @@ line of the form #!<interp>." (let ((fullname (if (file-name-directory file) file (eshell-search-path file))) (suffixes eshell-binary-suffixes)) - (if (and fullname - (not (file-remote-p fullname)) - (file-remote-p default-directory)) - (setq fullname (expand-file-name - (concat "./" fullname) default-directory))) + (when (and fullname + (not (file-remote-p fullname)) + (file-remote-p default-directory)) + (setq fullname + (if (file-name-absolute-p fullname) + (concat (file-remote-p default-directory) fullname) + (expand-file-name fullname default-directory)))) (if (and fullname (not (or eshell-force-execution (file-executable-p fullname)))) (while suffixes |