aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2021-03-12 16:09:42 +0100
committerMichael Albinus2021-03-12 16:09:42 +0100
commite609bf59ebb23c10f0e9f56df38f64be37de06dd (patch)
treeac27e8e49185bee006cb5bc8a16ca1e8c3ee7b75
parenta0854f939ce3a1de2c8cbc5e38b106a8df4480f6 (diff)
downloademacs-e609bf59ebb23c10f0e9f56df38f64be37de06dd.tar.gz
emacs-e609bf59ebb23c10f0e9f56df38f64be37de06dd.zip
Tramp sshfs fixes
* doc/misc/tramp.texi (FUSE setup): Fix typo. * lisp/net/tramp-sshfs.el (tramp-sshfs-handle-set-file-modes): Use `tramp-compat-set-file-modes'. * test/lisp/net/tramp-tests.el (tramp-test43-asynchronous-requests): Don't run for tramp-sshfs.
-rw-r--r--doc/misc/tramp.texi2
-rw-r--r--lisp/net/tramp-sshfs.el3
-rw-r--r--test/lisp/net/tramp-tests.el4
3 files changed, 6 insertions, 3 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index e5e15cdaa5d..7ae562244e2 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2653,7 +2653,7 @@ The method @option{sshfs} declares the mount arguments in the variable
2653a list of list of strings, and can be overwritten by the connection 2653a list of list of strings, and can be overwritten by the connection
2654property @t{"mount-args"}, @xref{Predefined connection information}. 2654property @t{"mount-args"}, @xref{Predefined connection information}.
2655 2655
2656Additionally. it declares also the arguments for running remote 2656Additionally, it declares also the arguments for running remote
2657processes, using the @command{ssh} command. These don't need to be 2657processes, using the @command{ssh} command. These don't need to be
2658changed. 2658changed.
2659 2659
diff --git a/lisp/net/tramp-sshfs.el b/lisp/net/tramp-sshfs.el
index ce9412c0bea..2a00d5ce678 100644
--- a/lisp/net/tramp-sshfs.el
+++ b/lisp/net/tramp-sshfs.el
@@ -276,7 +276,8 @@ arguments to pass to the OPERATION."
276 (with-parsed-tramp-file-name filename nil 276 (with-parsed-tramp-file-name filename nil
277 (unless (and (eq flag 'nofollow) (file-symlink-p filename)) 277 (unless (and (eq flag 'nofollow) (file-symlink-p filename))
278 (tramp-flush-file-properties v localname) 278 (tramp-flush-file-properties v localname)
279 (set-file-modes (tramp-fuse-local-file-name filename) mode flag)))) 279 (tramp-compat-set-file-modes
280 (tramp-fuse-local-file-name filename) mode flag))))
280 281
281(defun tramp-sshfs-handle-write-region 282(defun tramp-sshfs-handle-write-region
282 (start end filename &optional append visit lockname mustbenew) 283 (start end filename &optional append visit lockname mustbenew)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 6565919c771..be428fc2a64 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6380,7 +6380,7 @@ process sentinels. They shall not disturb each other."
6380 ;; Prior Emacs 27, `shell-file-name' was hard coded as "/bin/sh" for 6380 ;; Prior Emacs 27, `shell-file-name' was hard coded as "/bin/sh" for
6381 ;; remote processes in Emacs. That doesn't work for tramp-adb.el. 6381 ;; remote processes in Emacs. That doesn't work for tramp-adb.el.
6382 (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p)) 6382 (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p))
6383 (tramp--test-sh-p) (tramp--test-sshfs-p))) 6383 (tramp--test-sh-p)))
6384 (skip-unless (not (tramp--test-crypt-p))) 6384 (skip-unless (not (tramp--test-crypt-p)))
6385 (skip-unless (not (tramp--test-docker-p))) 6385 (skip-unless (not (tramp--test-docker-p)))
6386 (skip-unless (not (tramp--test-windows-nt-p))) 6386 (skip-unless (not (tramp--test-windows-nt-p)))
@@ -6767,6 +6767,8 @@ If INTERACTIVE is non-nil, the tests are run interactively."
6767;; * Fix `tramp-test06-directory-file-name' for `ftp'. 6767;; * Fix `tramp-test06-directory-file-name' for `ftp'.
6768;; * Implement `tramp-test31-interrupt-process' for `adb', `sshfs' and 6768;; * Implement `tramp-test31-interrupt-process' for `adb', `sshfs' and
6769;; for direct async processes. 6769;; for direct async processes.
6770;; * Check, why direct async processes do not work for
6771;; `tramp-test43-asynchronous-requests'.
6770 6772
6771(provide 'tramp-tests) 6773(provide 'tramp-tests)
6772 6774