Backport Tramp fixes, don't merge

* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.

* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.

diff --git a/lisp/net/tramp-sshfs.el b/lisp/net/tramp-sshfs.el
index a10078634539fa4c7c8f872b02f0c8b454354c58..1886031dec72b5f20cb956dc92739d14a2048498 100644 (file)
--- a/lisp/net/tramp-sshfs.el
+++ b/lisp/net/tramp-sshfs.el
@@ -110,7 +110,7 @@
     (file-notify-rm-watch . ignore)
     (file-notify-valid-p . ignore)
     (file-ownership-preserved-p . ignore)
-    (file-readable-p . tramp-fuse-handle-file-readable-p)
+    (file-readable-p . tramp-handle-file-readable-p)
     (file-regular-p . tramp-handle-file-regular-p)
     (file-remote-p . tramp-handle-file-remote-p)
     (file-selinux-context . tramp-handle-file-selinux-context)

diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el
index 98012f4e909ac7178a29f85614434646074112cf..0a484ff9bd133b2cf2d8fb0297d1c48f2016007a 100644 (file)
--- a/test/lisp/net/tramp-archive-tests.el
+++ b/test/lisp/net/tramp-archive-tests.el
@@ -265,21 +265,20 @@ variables, so we check the Emacs version directly."
               (concat
                (tramp-gvfs-url-file-name
                 (tramp-make-tramp-file-name
-                 tramp-archive-method
-                 ;; User and Domain.
-                 nil nil
-                 ;; Host.
-                 (url-hexify-string
-                  (concat
-                   "file://"
-                   ;; `directory-file-name' does not leave file
-                   ;; archive boundaries.  So we must cut the
-                   ;; trailing slash ourselves.
-                   (substring
-                    (file-name-directory
-                     (tramp-archive-test-file-archive-hexlified))
-                    0 -1)))
-                 nil "/"))
+                 (make-tramp-file-name
+                  :method tramp-archive-method
+                  :host
+                  (url-hexify-string
+                   (concat
+                    "file://"
+                    ;; `directory-file-name' does not leave file
+                    ;; archive boundaries.  So we must cut the
+                    ;; trailing slash ourselves.
+                    (substring
+                     (file-name-directory
+                      (tramp-archive-test-file-archive-hexlified))
+                     0 -1)))
+                  :localname "/")))
                (file-name-nondirectory tramp-archive-test-file-archive)))))
            (should-not port)
            (should (string-equal localname "/bar"))