diff options
| author | Kenichi Handa | 2012-08-30 21:07:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-08-30 21:07:42 +0900 |
| commit | 31e7d6e0902a895e13833204907dfb86268b5acf (patch) | |
| tree | 445b59dd5e87c8e2a8b969356386f45cae8cd6d9 /lisp/eshell | |
| parent | 4eb4de01df384be9b8d811f7ab476eeb37ece748 (diff) | |
| parent | f17e1d00e0513d781d2bd9a80af24bb047d32d5c (diff) | |
| download | emacs-31e7d6e0902a895e13833204907dfb86268b5acf.tar.gz emacs-31e7d6e0902a895e13833204907dfb86268b5acf.zip | |
merge trunk
Diffstat (limited to 'lisp/eshell')
| -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..." | |||
| 209 | (setq args (eshell-stringify-list (eshell-flatten-list args))) | 209 | (setq args (eshell-stringify-list (eshell-flatten-list args))) |
| 210 | ;; (if (file-remote-p default-directory) | 210 | ;; (if (file-remote-p default-directory) |
| 211 | ;; (eshell-remote-command command args)) | 211 | ;; (eshell-remote-command command args)) |
| 212 | (let ((interp (eshell-find-interpreter command))) | 212 | (let ((interp (eshell-find-interpreter |
| 213 | command | ||
| 214 | ;; Do not examine remote shell scripts. | ||
| 215 | (or (and (stringp command) (file-remote-p command)) | ||
| 216 | (file-remote-p default-directory))))) | ||
| 213 | (cl-assert interp) | 217 | (cl-assert interp) |
| 214 | (if (functionp (car interp)) | 218 | (if (functionp (car interp)) |
| 215 | (apply (car interp) (append (cdr interp) args)) | 219 | (apply (car interp) (append (cdr interp) args)) |