# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1185122987 0
# Node ID 75a66d77291f01609a78af04ec592794df2e6f8b
# Parent  b5df514a4be53f555dea4640f6ec84ca07236545
Sync with Tramp 2.1.10.

diff -r b5df514a4be5 -r 75a66d77291f lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jul 22 16:44:07 2007 +0000
+++ b/lisp/ChangeLog	Sun Jul 22 16:49:47 2007 +0000
@@ -1,3 +1,11 @@
+2007-07-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.1.10.
+
+	* tramp.el (tramp-get-ls-command): Fyx typo.
+
+        * trampver.el: Update release number.
+
 2007-07-22  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* startup.el (command-line-x-option-alist): Use x-handle-no-bitmap-icon,
diff -r b5df514a4be5 -r 75a66d77291f lisp/net/tramp.el
--- a/lisp/net/tramp.el	Sun Jul 22 16:44:07 2007 +0000
+++ b/lisp/net/tramp.el	Sun Jul 22 16:49:47 2007 +0000
@@ -6551,8 +6551,7 @@
 		   (and
 		    dl
 		    (not
-		     (string-equal
-		      result (expand-file-name-as-directory cmd (car dl)))))
+		     (string-equal result (expand-file-name cmd (car dl)))))
 		 (setq dl (cdr dl)))
 	       (setq dl (cdr dl))))))
        (tramp-error vec 'file-error "Couldn't find a proper `ls' command")))))