summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp-gvfs.el6
-rw-r--r--lisp/net/tramp.el3
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index ebe57a8bcec..7e226398d1f 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1866,7 +1866,11 @@ Their full names are \"org.gtk.vfs.MountTracker.mounted\" and
port (tramp-file-name-port v)))))
(when (member method tramp-gvfs-methods)
(with-parsed-tramp-file-name
- (tramp-make-tramp-file-name method user domain host port "") nil
+ ;; 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
(tramp-message
v 6 "%s %s"
signal-name (tramp-gvfs-stringify-dbus-message mount-info))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 372e0a2cb73..b152584c1f8 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1758,6 +1758,9 @@ the form (METHOD USER DOMAIN HOST PORT LOCALNAME &optional HOP)."
tramp-postfix-host-format
localname)))
+(set-advertised-calling-convention
+ #'tramp-make-tramp-file-name '(vec &optional localname hop) "27.1")
+
(defun tramp-make-tramp-hop-name (vec)
"Construct a Tramp hop name from VEC."
(replace-regexp-in-string