diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/eshell/esh-ext.el | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a82048617cf..149c75b1c75 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-07-10 Michael Albinus <michael.albinus@gmx.de> + + * eshell/esh-ext.el (eshell-remote-command): Remove remote part of + command, just in case. The function is not needed anymore. + (eshell-external-command): Do not call `eshell-remote-command'. + 2012-07-10 Stefan Monnier <monnier@iro.umontreal.ca> Reduce use of (require 'cl). diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index f025c66df32..a411d3df06e 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -188,6 +188,7 @@ all the output from the remote command, and sends it all at once, causing the user to wonder if anything's really going on..." (let ((outbuf (generate-new-buffer " *eshell remote output*")) (errbuf (generate-new-buffer " *eshell remote error*")) + (command (or (file-remote-p command 'localname) command)) (exitcode 1)) (unwind-protect (progn @@ -205,8 +206,8 @@ causing the user to wonder if anything's really going on..." (defun eshell-external-command (command args) "Insert output from an external COMMAND, using ARGS." (setq args (eshell-stringify-list (eshell-flatten-list args))) - (if (file-remote-p default-directory) - (eshell-remote-command command args)) +; (if (file-remote-p default-directory) +; (eshell-remote-command command args)) (let ((interp (eshell-find-interpreter command))) (assert interp) (if (functionp (car interp)) |