From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 22 May 2023 14:08:23 +0000 (+0200)
Subject: Support existing sshfs and rclone mount points in Tramp
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=abb11eb3a3c1a8a29a43c584bcaa8917db52a541;p=emacs.git

Support existing sshfs and rclone mount points in Tramp

* lisp/net/tramp-fuse.el (tramp-fuse-mount-point, tramp-fuse-mounted-p):
Support existing mount points.
---

diff --git a/lisp/net/tramp-fuse.el b/lisp/net/tramp-fuse.el
index 8112e564a2c..5c0bb8e8d96 100644
--- a/lisp/net/tramp-fuse.el
+++ b/lisp/net/tramp-fuse.el
@@ -141,7 +141,7 @@
 
 (defun tramp-fuse-mount-point (vec)
   "Return local mount point of VEC."
-  (or (tramp-get-connection-property vec "mount-point")
+  (or (tramp-get-file-property vec "/" "mount-point")
       (expand-file-name
        (concat
 	tramp-temp-name-prefix
@@ -173,8 +173,11 @@ It has the same meaning as `remote-file-name-inhibit-cache'.")
           (tramp-set-file-property
 	   vec "/" "mounted"
            (when (string-match
-	          (rx bol (group (literal (tramp-fuse-mount-spec vec))) blank)
+	          (rx bol (group (literal (tramp-fuse-mount-spec vec)))
+		      " on " (group (+ (not blank))) blank)
 	          mount)
+	     (tramp-set-file-property
+	      vec "/" "mount-point" (match-string 2 mount))
              (match-string 1 mount)))))))
 
 (defun tramp-fuse-get-fusermount ()