diff options
| author | Anders Lindgren <andlind@gmail.com> | 2015-10-28 12:22:44 +0100 |
|---|---|---|
| committer | Anders Lindgren <andlind@gmail.com> | 2015-10-28 12:22:44 +0100 |
| commit | 1e2ed2687ad35d7a3efee1ef1d482d595eb0879f (patch) | |
| tree | dc140d791aa64e24f3de8c318fe589948b2d5cab | |
| parent | e69f7770611d85e130806763a46db7e212bc952f (diff) | |
| parent | e5ff0e67ccb5c32ff7685f8e3c6792af7c611bbb (diff) | |
| download | emacs-1e2ed2687ad35d7a3efee1ef1d482d595eb0879f.tar.gz | |
Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh
| -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." |