diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2015-10-28 12:12:51 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2015-10-28 12:12:51 +0100 |
| commit | e1d0eefae83d691372455afffeb471ce6dcb8345 (patch) | |
| tree | 0a1cac54d724f2c2e8f2776967d304b1b01fd9bb /lisp | |
| parent | 64c2bfbc4f5daba2ee55acb58a2929070a846b6e (diff) | |
| download | emacs-e1d0eefae83d691372455afffeb471ce6dcb8345.tar.gz | |
Revert 692bce5b9eccfae19ae2a5a23a9ccd8d6bf86076
* lisp/net/tramp-smb.el (tramp-smb-handle-directory-files):
Revert 692bce5b9eccfae19ae2a5a23a9ccd8d6bf86076, `delete-dups'
does not exist in XEmacs 21.4.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp-smb.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index c0a6b6afa6d..5910d1fd3a4 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -649,7 +649,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (directory &optional full match nosort) "Like `directory-files' for Tramp files." (let ((result (mapcar 'directory-file-name - (file-name-all-completions "" directory)))) + (file-name-all-completions "" directory))) + res) ;; Discriminate with regexp. (when match (setq result @@ -664,7 +665,9 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." result))) ;; Sort them if necessary. (unless nosort (setq result (sort result 'string-lessp))) - (delete-dups result))) + ;; Remove double entries. + (dolist (elt result res) + (add-to-list 'res elt 'append)))) (defun tramp-smb-handle-expand-file-name (name &optional dir) "Like `expand-file-name' for Tramp files." |