mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 22:20:56 -08:00
Code Issues Projects Releases Wiki Activity

Backport Tramp fixes, don't merge

Browse source 
* 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'.
This commit is contained in:
Michael Albinus 2021-11-24 16:54:59 +01:00
parent 756b8a5f1b
commit 764ffa76ed
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/net/tramp-sshfs.el
View file

@ -110,7 +110,7 @@
(file-notify-rm-watch . ignore) (file-notify-rm-watch . ignore)
(file-notify-valid-p . ignore) (file-notify-valid-p . ignore)
(file-ownership-preserved-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-regular-p . tramp-handle-file-regular-p)
(file-remote-p . tramp-handle-file-remote-p) (file-remote-p . tramp-handle-file-remote-p)
(file-selinux-context . tramp-handle-file-selinux-context) (file-selinux-context . tramp-handle-file-selinux-context)

29
test/lisp/net/tramp-archive-tests.el
View file

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