summaryrefslogtreecommitdiff
path: root/lisp/net/tramp.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2020-11-02 17:56:06 +0100
committerMichael Albinus <michael.albinus@gmx.de>2020-11-02 17:56:06 +0100
commite654b41c6f9eae424736bc8845d92b9dd97ccd3e (patch)
tree53c7d09c4e5efd8f281888bc13527844a5933136 /lisp/net/tramp.el
parent554495006e8d33a06c5df63fd8767c1124e1ed9e (diff)
downloademacs-e654b41c6f9eae424736bc8845d92b9dd97ccd3e.tar.gz
emacs-e654b41c6f9eae424736bc8845d92b9dd97ccd3e.tar.bz2
emacs-e654b41c6f9eae424736bc8845d92b9dd97ccd3e.zip
Fix some glitches in recent directory-files-* changes
* doc/lispref/files.texi (Contents of Directories): Fix description of directory-files, directory-empty-p and directory-files-and-attributes. * etc/NEWS: Fix entry for directory-files-and-attributes. Fix typos. * lisp/dired.el (directory-empty-p): Move function from here ... * lisp/files.el (directory-empty-p): ... to here. * lisp/net/ange-ftp.el (ange-ftp-directory-files): Call `nreverse' later. * lisp/net/tramp.el (tramp-handle-directory-files): * lisp/net/tramp-adb.el (tramp-adb-handle-directory-files-and-attributes): Do not call `nreverse'. * src/dired.c (Fdirectory_files) (Fdirectory_files_and_attributes): Fix docstrings. * test/src/dired-tests.el: Removed. Tests moved to test/lisp/dired-tests.el. * test/lisp/dired-tests.el (dired-test-bug27899): Tag it :unstable. (dired-test-directory-files) (dired-test-directory-files-and-attributes): New tests.
Diffstat (limited to 'lisp/net/tramp.el')
-rw-r--r--lisp/net/tramp.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 25fa9754881..ce0a2b54ff5 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3135,8 +3135,8 @@ User is always nil."
(unless nosort
(setq result (sort result #'string<)))
(when (natnump count)
- (setq result (last file count))
- (nreverse files)))))
+ (setq result (last result count)))
+ result)))
(defun tramp-handle-directory-files-and-attributes
(directory &optional full match nosort id-format count)