1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
* lisp/net/tramp-smb.el (tramp-smb-handle-directory-files):
Revert 692bce5b9e, `delete-dups'
does not exist in XEmacs 21.4.
This commit is contained in:
Michael Albinus 2015-10-28 12:12:51 +01:00
parent 64c2bfbc4f
commit e1d0eefae8

View File

@ -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."