[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master e5ff0e6 3/3: Merge branch 'master' of ssh://git.sv.
From: |
Anders Lindgren |
Subject: |
[Emacs-diffs] master e5ff0e6 3/3: Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs |
Date: |
Wed, 28 Oct 2015 11:21:14 +0000 |
branch: master
commit e5ff0e67ccb5c32ff7685f8e3c6792af7c611bbb
Merge: cc587a3 e1d0eef
Author: Anders Lindgren <address@hidden>
Commit: Anders Lindgren <address@hidden>
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs
---
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 c0a6b6a..5910d1f 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."