[Emacs-diffs] /srv/bzr/emacs/trunk r100860: * net/tramp.el (tramp-get-ls-command)

[Michael Albinus]

------------------------------------------------------------
revno: 100860
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2010-07-21 06:40:47 +0200
message:
  * net/tramp.el (tramp-get-ls-command)
  (tramp-get-ls-command-with-dired): Run tests on "/dev/null"
  instead of "/".
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-07-21 01:56:55 +0000
+++ b/lisp/ChangeLog    2010-07-21 04:40:47 +0000
@@ -1,3 +1,9 @@
+2010-07-21  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-get-ls-command)
+       (tramp-get-ls-command-with-dired): Run tests on "/dev/null"
+       instead of "/".
+
 2010-07-20  Michael R. Mauger  <address@hidden>
 
        * progmodes/sql.el: Version 2.3.

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-07-20 19:15:01 +0000
+++ b/lisp/net/tramp.el 2010-07-21 04:40:47 +0000
@@ -8344,7 +8344,8 @@
             (when (zerop (tramp-send-command-and-check
                           vec (format "%s -lnd /" result)))
               (when (zerop (tramp-send-command-and-check
-                            vec (format "%s --color=never -al /" result)))
+                            vec (format
+                                 "%s --color=never -al /dev/null" result)))
                 (setq result (concat result " --color=never")))
               (throw 'ls-found result))
             (setq dl (cdr dl))))))
@@ -8358,7 +8359,8 @@
       ;; they fail when "-al" is after the "--dired" argument (for
       ;; example on FreeBSD).
       (zerop (tramp-send-command-and-check
-             vec (format "%s --dired -al /" (tramp-get-ls-command vec)))))))
+             vec (format "%s --dired -al /dev/null"
+                         (tramp-get-ls-command vec)))))))
 
 (defun tramp-get-test-command (vec)
   (with-connection-property vec "test"