[Emacs-diffs] /srv/bzr/emacs/trunk r109810: * eshell/esh-ext.el (eshell-external-command): Do not examine

[Michael Albinus]

------------------------------------------------------------
revno: 109810
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Wed 2012-08-29 14:49:44 +0200
message:
  * 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".
modified:
  lisp/ChangeLog
  lisp/eshell/esh-ext.el
  lisp/net/tramp-sh.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-28 19:35:35 +0000
+++ b/lisp/ChangeLog    2012-08-29 12:49:44 +0000
@@ -1,3 +1,12 @@
+2012-08-29  Michael Albinus  <address@hidden>
+
+       * 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".
+
 2012-08-28  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/cl-lib.el (buffer-string): Fix setter macro (bug#12293).

=== modified file 'lisp/eshell/esh-ext.el'
--- a/lisp/eshell/esh-ext.el    2012-08-06 07:10:27 +0000
+++ b/lisp/eshell/esh-ext.el    2012-08-29 12:49:44 +0000
@@ -209,7 +209,11 @@
   (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))

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2012-08-17 09:18:18 +0000
+++ b/lisp/net/tramp-sh.el      2012-08-29 12:49:44 +0000
@@ -512,9 +512,9 @@
 ;; IRIX64: /usr/bin
 ;;;###tramp-autoload
 (defcustom tramp-remote-path
-  '(tramp-default-remote-path "/bin" "/usr/bin" "/usr/sbin"
-    "/usr/local/bin" "/local/bin" "/local/freeware/bin" "/local/gnu/bin"
-    "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin"
+  '(tramp-default-remote-path "/bin" "/usr/bin" "/sbin" "/usr/sbin"
+    "/usr/local/bin" "/usr/local/sbin" "/local/bin" "/local/freeware/bin"
+    "/local/gnu/bin" "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin"
     "/opt/bin" "/opt/sbin" "/opt/local/bin")
   "List of directories to search for executables on remote host.
 For every remote host, this variable will be set buffer local,