From 31c700022679c2893d951e403d406d00277e1a59 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 22 Jul 2007 16:50:21 +0000 Subject: Sync with Tramp 2.1.10. --- lisp/ChangeLog | 8 ++++++++ lisp/net/tramp.el | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5dc4b6f90..064e070cde 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2007-07-22 Michael Albinus + + 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 * 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 792233925f..cbe7040f60 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"))))) -- cgit v1.2.3