aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/net/tramp-smb.el7
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."
649 (directory &optional full match nosort) 649 (directory &optional full match nosort)
650 "Like `directory-files' for Tramp files." 650 "Like `directory-files' for Tramp files."
651 (let ((result (mapcar 'directory-file-name 651 (let ((result (mapcar 'directory-file-name
652 (file-name-all-completions "" directory)))) 652 (file-name-all-completions "" directory)))
653 res)
653 ;; Discriminate with regexp. 654 ;; Discriminate with regexp.
654 (when match 655 (when match
655 (setq result 656 (setq result
@@ -664,7 +665,9 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
664 result))) 665 result)))
665 ;; Sort them if necessary. 666 ;; Sort them if necessary.
666 (unless nosort (setq result (sort result 'string-lessp))) 667 (unless nosort (setq result (sort result 'string-lessp)))
667 (delete-dups result))) 668 ;; Remove double entries.
669 (dolist (elt result res)
670 (add-to-list 'res elt 'append))))
668 671
669(defun tramp-smb-handle-expand-file-name (name &optional dir) 672(defun tramp-smb-handle-expand-file-name (name &optional dir)
670 "Like `expand-file-name' for Tramp files." 673 "Like `expand-file-name' for Tramp files."