diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2012-08-29 14:49:44 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2012-08-29 14:49:44 +0200 |
| commit | c2c43c2382db292bfe3cccbccad4386f81f9c8a4 (patch) | |
| tree | 623daaff9aea8598a9f23f7845bfdf38d5d4a905 /lisp/eshell/esh-ext.el | |
| parent | d5e2bcd3514bbf1a4e7022efd3b6555379d690a8 (diff) | |
| download | emacs-c2c43c2382db292bfe3cccbccad4386f81f9c8a4.tar.gz | |
* eshell/esh-ext.el (eshell-external-command): Do not examine
remote shell scripts. See
<https://bugs.launchpad.net/ubuntu/+source/emacs23/+bug/1035790>.
* net/tramp-sh.el (tramp-remote-path): Add "/sbin" and
"/usr/local/sbin".
Diffstat (limited to 'lisp/eshell/esh-ext.el')
| -rw-r--r-- | lisp/eshell/esh-ext.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 52df1587d5f..f9f9b1a558f 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -209,7 +209,11 @@ causing the user to wonder if anything's really going on..." (setq args (eshell-stringify-list (eshell-flatten-list args))) ;; (if (file-remote-p default-directory) ;; (eshell-remote-command command args)) - (let ((interp (eshell-find-interpreter command))) + (let ((interp (eshell-find-interpreter + command + ;; Do not examine remote shell scripts. + (or (and (stringp command) (file-remote-p command)) + (file-remote-p default-directory))))) (cl-assert interp) (if (functionp (car interp)) (apply (car interp) (append (cdr interp) args)) |