From 10e739941705b705bfd1e336b538a3a45aaa4fff Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 21 Jul 2010 06:40:47 +0200 Subject: [PATCH] * net/tramp.el (tramp-get-ls-command) (tramp-get-ls-command-with-dired): Run tests on "/dev/null" instead of "/". --- lisp/ChangeLog | 6 ++++++ lisp/net/tramp.el | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9b932cd4ae..5ead7c3856a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-07-21 Michael Albinus + + * 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 * progmodes/sql.el: Version 2.3. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a32daf278f7..1c9a7015bf2 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -8344,7 +8344,8 @@ necessary only. This function will be used in file name completion." (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 @@ necessary only. This function will be used in file name completion." ;; 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" -- 2.39.2