# HG changeset patch
# User Michael Albinus <albinus@detlef>
# Date 1279356299 -7200
# Node ID 333d4b14e6cbc3b5f31574f6c354fe9899d7605e
# Parent  334eb787177596b91a4ecea67a4c0f88d33d6d6b
* net/tramp.el (tramp-get-ls-command-with-dired): Make test for
"--dired" stronger.

diff -r 334eb7871775 -r 333d4b14e6cb lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jul 16 22:49:48 2010 -0400
+++ b/lisp/ChangeLog	Sat Jul 17 10:44:59 2010 +0200
@@ -1,3 +1,8 @@
+2010-07-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-get-ls-command-with-dired): Make test for
+	"--dired" stronger.
+
 2010-07-17  Chong Yidong  <cyd@stupidchicken.com>
 
 	* term/x-win.el (x-select-enable-primary): Change default to nil.
diff -r 334eb7871775 -r 333d4b14e6cb lisp/net/tramp.el
--- a/lisp/net/tramp.el	Fri Jul 16 22:49:48 2010 -0400
+++ b/lisp/net/tramp.el	Sat Jul 17 10:44:59 2010 +0200
@@ -1037,6 +1037,7 @@
 ;; Solaris: /usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin
 ;; GNU/Linux (Debian, Suse): /bin:/usr/bin
 ;; FreeBSD: /usr/bin:/bin:/usr/sbin:/sbin: - beware trailing ":"!
+;; IRIX64: /usr/bin
 (defcustom tramp-remote-path
   '(tramp-default-remote-path "/usr/sbin" "/usr/local/bin"
     "/local/bin" "/local/freeware/bin" "/local/gnu/bin"
@@ -8335,8 +8336,11 @@
   (save-match-data
     (with-connection-property vec "ls-dired"
       (tramp-message vec 5 "Checking, whether `ls --dired' works")
+      ;; Some "ls" versions are sensible wrt the order of arguments,
+      ;; they fail when "-al" is after the "--dired" argument (for
+      ;; example on FreeBSD).
       (zerop (tramp-send-command-and-check
-	      vec (format "%s --dired /" (tramp-get-ls-command vec)))))))
+	      vec (format "%s --dired -al /" (tramp-get-ls-command vec)))))))
 
 (defun tramp-get-test-command (vec)
   (with-connection-property vec "test"
@@ -8936,7 +8940,6 @@
 ;;   without built-in uuencode/uudecode.
 ;; * Let `shell-dynamic-complete-*' and `comint-dynamic-complete' work
 ;;   on remote hosts.
-;; * Use secrets.el for password handling.
 ;; * Load ~/.emacs_SHELLNAME on the remote host for `shell'.
 
 ;; Functions for file-name-handler-alist: