diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-11-05 17:36:04 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-11-05 17:36:04 +0100 |
| commit | 334e2ab440a466a40b7c28d26dfe4207c6bb95e8 (patch) | |
| tree | 8e0aae8adb25189a8a5f940b35d87f172384c5ad /lisp/net/tramp-rclone.el | |
| parent | ef5211d0aa3186fffa43639072fc3325a3003623 (diff) | |
| download | emacs-334e2ab440a466a40b7c28d26dfe4207c6bb95e8.tar.gz | |
Still fixes for Tramp directory-files-*
* lisp/net/tramp.el (tramp-handle-directory-files):
* lisp/net/tramp-adb.el
(tramp-adb-handle-directory-files-and-attributes): Fix COUNT.
* lisp/net/tramp-crypt.el (tramp-crypt-handle-directory-files):
Implement COUNT.
* lisp/net/tramp-gvfs.el (tramp-gvfs-dbus-byte-array-to-string):
* lisp/net/tramp-integration.el (tramp-eshell-directory-change):
Use `nbutlast'.
* lisp/net/tramp-rclone.el (tramp-rclone-handle-delete-directory)
(tramp-rclone-handle-delete-file): Reorder cache flushing.
(tramp-rclone-handle-directory-files):
Use `tramp-compat-directory-files'.
* lisp/net/tramp-sh.el (tramp-sh-handle-directory-files-and-attributes):
Fix NOSORT and COUNT.
* lisp/net/tramp-smb.el (tramp-smb-handle-directory-files): Fix NOSORT.
* test/lisp/net/tramp-tests.el (tramp--test-share-p): New defun.
(tramp-test05-expand-file-name-relative): Use it.
(tramp-test16-directory-files)
(tramp-test19-directory-files-and-attributes): Strengthen test.
(tramp-test20-file-modes): Simplify check.
Diffstat (limited to 'lisp/net/tramp-rclone.el')
| -rw-r--r-- | lisp/net/tramp-rclone.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/net/tramp-rclone.el b/lisp/net/tramp-rclone.el index 1a7b0600d23..4790bb453d3 100644 --- a/lisp/net/tramp-rclone.el +++ b/lisp/net/tramp-rclone.el @@ -289,16 +289,16 @@ file names." (directory &optional recursive trash) "Like `delete-directory' for Tramp files." (with-parsed-tramp-file-name (expand-file-name directory) nil - (delete-directory (tramp-rclone-local-file-name directory) recursive trash) (tramp-flush-directory-properties v localname) - (tramp-rclone-flush-directory-cache v))) + (tramp-rclone-flush-directory-cache v) + (delete-directory (tramp-rclone-local-file-name directory) recursive trash))) (defun tramp-rclone-handle-delete-file (filename &optional trash) "Like `delete-file' for Tramp files." (with-parsed-tramp-file-name (expand-file-name filename) nil + (tramp-rclone-flush-directory-cache v) (delete-file (tramp-rclone-local-file-name filename) trash) - (tramp-flush-file-properties v localname) - (tramp-rclone-flush-directory-cache v))) + (tramp-flush-file-properties v localname))) (defun tramp-rclone-handle-directory-files (directory &optional full match nosort count) @@ -311,8 +311,8 @@ file names." (setq directory (file-name-as-directory (expand-file-name directory))) (with-parsed-tramp-file-name directory nil (let ((result - (directory-files - (tramp-rclone-local-file-name directory) full match count))) + (tramp-compat-directory-files + (tramp-rclone-local-file-name directory) full match nosort count))) ;; Massage the result. (when full (let ((local (concat "^" (regexp-quote (tramp-rclone-mount-point v)))) |