diff options
Diffstat (limited to 'lisp/net/tramp-fuse.el')
| -rw-r--r-- | lisp/net/tramp-fuse.el | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lisp/net/tramp-fuse.el b/lisp/net/tramp-fuse.el index 7344c3c730a..2ff106d6023 100644 --- a/lisp/net/tramp-fuse.el +++ b/lisp/net/tramp-fuse.el @@ -59,7 +59,7 @@ (directory &optional full match nosort count) "Like `directory-files' for Tramp files." (unless (file-exists-p directory) - (tramp-compat-file-missing (tramp-dissect-file-name directory) directory)) + (tramp-error (tramp-dissect-file-name directory) 'file-missing directory)) (when (file-directory-p directory) (setq directory (file-name-as-directory (expand-file-name directory))) (with-parsed-tramp-file-name directory nil @@ -120,12 +120,6 @@ (unless (string-match-p elt item) (throw 'match nil))) (setq result (cons (concat item "/") result))))))))))) -(defun tramp-fuse-handle-file-readable-p (filename) - "Like `file-readable-p' for Tramp files." - (with-parsed-tramp-file-name (expand-file-name filename) nil - (with-tramp-file-property v localname "file-readable-p" - (file-readable-p (tramp-fuse-local-file-name filename))))) - ;; This function isn't used. (defun tramp-fuse-handle-insert-directory (filename switches &optional wildcard full-directory-p) @@ -159,7 +153,7 @@ (defun tramp-fuse-mount-point (vec) "Return local mount point of VEC." - (or (tramp-get-connection-property vec "mount-point" nil) + (or (tramp-get-connection-property vec "mount-point") (expand-file-name (concat tramp-temp-name-prefix @@ -183,7 +177,7 @@ It has the same meaning as `remote-file-name-inhibit-cache'.") ;; cannot use `with-tramp-file-property', because we don't want to ;; cache a nil result. (let ((remote-file-name-inhibit-cache tramp-fuse-mount-timeout)) - (or (tramp-get-file-property vec "/" "mounted" nil) + (or (tramp-get-file-property vec "/" "mounted") (let* ((default-directory tramp-compat-temporary-file-directory) (command (format "mount -t fuse.%s" (tramp-file-name-method vec))) (mount (shell-command-to-string command))) |