diff options
| author | Arthur Miller <arthur.miller@live.com> | 2020-11-02 12:38:27 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-11-02 12:38:27 +0100 |
| commit | 0806075520939d120a47113f1c121e3d63b34770 (patch) | |
| tree | e5d9dd2ba5bdea3e1f95fd6a10f1c87dac76cf44 /lisp/net/tramp-smb.el | |
| parent | ce1856ec09dd312667d8f7cf9ffc908b473d27b8 (diff) | |
| download | emacs-0806075520939d120a47113f1c121e3d63b34770.tar.gz emacs-0806075520939d120a47113f1c121e3d63b34770.tar.bz2 emacs-0806075520939d120a47113f1c121e3d63b34770.zip | |
Add directory-empty-p and new argument COUNT for directory-files-*
* doc/lispref/files.texi (Contents of Directories): Mention COUNT
argument of directory-files. Add directory-empty-p.
* etc/NEWS: Mention directory-empty-p and directory-files changes.
* lisp/dired.el (directory-empty-p): New defun.
* lisp/net/ange-ftp.el (ange-ftp-directory-files)
(ange-ftp-directory-files-and-attributes):
* lisp/net/tramp.el (tramp-handle-directory-files)
(tramp-handle-directory-files-and-attributes):
* lisp/net/tramp-adb.el
(tramp-adb-handle-directory-files-and-attributes):
* lisp/net/tramp-rclone.el (tramp-rclone-handle-directory-files):
* lisp/net/tramp-sh.el (tramp-sh-handle-directory-files-and-attributes):
* lisp/net/tramp-smb.el (tramp-smb-handle-directory-files): Add new COUNT
argument.
* src/dired.c (directory_files_internal): Implement new
RETURN_COUNT argument.
(Fdirectory_files, Fdirectory_files_and_attributes): Add new COUNT
argument.
* src/lisp.h (directory_files_internal): Add RETURN_COUNT to declaration.
* src/sysdep.c (list_system_processes): Add Qnil to
directory_files_internal call.
* test/src/dired-tests.el (directory-files-and-attributes-tests):
New file.
Diffstat (limited to 'lisp/net/tramp-smb.el')
| -rw-r--r-- | lisp/net/tramp-smb.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index c236e1cb65f..b3b6a94e9cc 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -689,7 +689,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (tramp-error v 'file-error "%s `%s'" (match-string 0) filename))))))) (defun tramp-smb-handle-directory-files - (directory &optional full match nosort) + (directory &optional full match nosort count) "Like `directory-files' for Tramp files." (unless (file-exists-p directory) (tramp-error @@ -703,6 +703,11 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (delete nil (mapcar (lambda (x) (when (string-match-p match x) x)) result)))) + + ;; return count number of results + (when (and (natnump count) (> count 0)) + (setq result (nbutlast result (- (length result) count)))) + ;; Prepend directory. (when full (setq result |