Sync with Tramp 2.1.10.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5dc4b6f90c..064e070cded 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 792233925fc..cbe7040f609 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6551,8 +6551,7 @@ necessary only.  This function will be used in file name completion."
                    (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")))))