Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-15 04:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh

Browse source
This commit is contained in:
Anders Lindgren 2015-10-28 12:22:44 +01:00
commit 1e2ed2687a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/net/tramp-smb.el
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."