emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master e1d0eef: Revert 692bce5b9eccfae19ae2a5a23a9ccd8d6bf


From: Michael Albinus
Subject: [Emacs-diffs] master e1d0eef: Revert 692bce5b9eccfae19ae2a5a23a9ccd8d6bf86076
Date: Wed, 28 Oct 2015 11:12:59 +0000

branch: master
commit e1d0eefae83d691372455afffeb471ce6dcb8345
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Revert 692bce5b9eccfae19ae2a5a23a9ccd8d6bf86076
    
    * lisp/net/tramp-smb.el (tramp-smb-handle-directory-files):
    Revert 692bce5b9eccfae19ae2a5a23a9ccd8d6bf86076, `delete-dups'
    does not exist in XEmacs 21.4.
---
 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."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]