diff options
| author | Michael Albinus <[email protected]> | 2007-07-22 16:50:21 +0000 |
|---|---|---|
| committer | Michael Albinus <[email protected]> | 2007-07-22 16:50:21 +0000 |
| commit | 31c700022679c2893d951e403d406d00277e1a59 (patch) | |
| tree | 1dae23cc3c8a73ca5f4fd5560de28aa44d7b91e3 /lisp | |
| parent | bbd281458d4bb924fb0ad231d228e2bdd50d1120 (diff) | |
Sync with Tramp 2.1.10.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | 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 <[email protected]> + + 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 <[email protected]> * 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"))))) |