diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2021-11-01 12:32:06 +0100 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2021-11-01 12:32:06 +0100 |
commit | 8b861b07cf9d41da15f751b996d88d7079653508 (patch) | |
tree | a755cd85dfe73eb133f84e4d1ccc2435ce9ddb85 /lisp/net | |
parent | 567fa8d7c04ec22a5ff54229c16f370b95a89ff0 (diff) | |
parent | ba4daf22144e9a68b1797d6a3b621f2b6b16a293 (diff) | |
download | emacs-8b861b07cf9d41da15f751b996d88d7079653508.tar.gz emacs-8b861b07cf9d41da15f751b996d88d7079653508.tar.bz2 emacs-8b861b07cf9d41da15f751b996d88d7079653508.zip |
Merge from origin/emacs-28
ba4daf2214 Adapt arguments of `tramp-make-tramp-file-name'
a34466731b Fix typo in describe-map-tree doc string
Diffstat (limited to 'lisp/net')
-rw-r--r-- | lisp/net/tramp-gvfs.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 7e226398d1f..cab912bd93a 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -1865,12 +1865,9 @@ Their full names are \"org.gtk.vfs.MountTracker.mounted\" and host (tramp-file-name-host v) port (tramp-file-name-port v))))) (when (member method tramp-gvfs-methods) - (with-parsed-tramp-file-name - ;; This must be changed when we throw the old signature - ;; away in Emacs 27.1 and higher. - (with-no-warnings - (tramp-make-tramp-file-name method user domain host port "")) - nil + (let ((v (make-tramp-file-name + :method method :user user :domain domain + :host host :port port))) (tramp-message v 6 "%s %s" signal-name (tramp-gvfs-stringify-dbus-message mount-info)) |