diff options
| author | Michael Albinus | 2023-05-22 16:08:23 +0200 |
|---|---|---|
| committer | Michael Albinus | 2023-05-22 16:08:23 +0200 |
| commit | abb11eb3a3c1a8a29a43c584bcaa8917db52a541 (patch) | |
| tree | 9c7cf818fcf6a21bc113a3e6068643e187860182 | |
| parent | 438b1205c54dbdeff234d14dcf2287cbf6769522 (diff) | |
| download | emacs-abb11eb3a3c1a8a29a43c584bcaa8917db52a541.tar.gz emacs-abb11eb3a3c1a8a29a43c584bcaa8917db52a541.zip | |
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.
| -rw-r--r-- | lisp/net/tramp-fuse.el | 7 |
1 files changed, 5 insertions, 2 deletions
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 @@ | |||
| 141 | 141 | ||
| 142 | (defun tramp-fuse-mount-point (vec) | 142 | (defun tramp-fuse-mount-point (vec) |
| 143 | "Return local mount point of VEC." | 143 | "Return local mount point of VEC." |
| 144 | (or (tramp-get-connection-property vec "mount-point") | 144 | (or (tramp-get-file-property vec "/" "mount-point") |
| 145 | (expand-file-name | 145 | (expand-file-name |
| 146 | (concat | 146 | (concat |
| 147 | tramp-temp-name-prefix | 147 | tramp-temp-name-prefix |
| @@ -173,8 +173,11 @@ It has the same meaning as `remote-file-name-inhibit-cache'.") | |||
| 173 | (tramp-set-file-property | 173 | (tramp-set-file-property |
| 174 | vec "/" "mounted" | 174 | vec "/" "mounted" |
| 175 | (when (string-match | 175 | (when (string-match |
| 176 | (rx bol (group (literal (tramp-fuse-mount-spec vec))) blank) | 176 | (rx bol (group (literal (tramp-fuse-mount-spec vec))) |
| 177 | " on " (group (+ (not blank))) blank) | ||
| 177 | mount) | 178 | mount) |
| 179 | (tramp-set-file-property | ||
| 180 | vec "/" "mount-point" (match-string 2 mount)) | ||
| 178 | (match-string 1 mount))))))) | 181 | (match-string 1 mount))))))) |
| 179 | 182 | ||
| 180 | (defun tramp-fuse-get-fusermount () | 183 | (defun tramp-fuse-get-fusermount () |