Adapt arguments of `tramp-make-tramp-file-name'

* lisp/net/tramp-gvfs.el (tramp-gvfs-handler-mounted-unmounted):
* lisp/url/url-tramp.el (url-tramp-convert-url-to-tramp):
Use `make-tramp-file-name'.

* lisp/obsolete/rcompile.el (remote-compile): Pacify byte-compiler.

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 7e226398d1f1af2aec8da3093450f1b3cd24f0ee..cab912bd93a6bfaba26ac9d7a5d2c187d96efbdf 100644 (file)
--- 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))

diff --git a/lisp/obsolete/rcompile.el b/lisp/obsolete/rcompile.el
index ff7d1dcdceaf03cd882a0777caad3d7027749455..c8fb9f20985a8979cb9f303742cb09a70edafa69 100644 (file)
--- a/lisp/obsolete/rcompile.el
+++ b/lisp/obsolete/rcompile.el
@@ -109,6 +109,9 @@ nil means run no commands."
 ;;;; entry point
 
 ;; We use the Tramp internal function `tramp-make-tramp-file-name'.
+;; It has changed its signature in Emacs 27.1, supporting still the
+;; old calling convention.  Let's assume rcompile.el has been removed
+;; once Tramp does not support it any longer.
 ;; Better would be, if there are functions to provide user, host and
 ;; localname of a remote filename, independent of Tramp's implementation.
 ;; The function calls are wrapped by `funcall' in order to pacify the byte
@@ -167,7 +170,8 @@ See \\[compile]."
     (with-current-buffer compilation-last-buffer
       (when (fboundp 'tramp-make-tramp-file-name)
        (set (make-local-variable 'comint-file-name-prefix)
-            (tramp-make-tramp-file-name
+            (funcall
+              #'tramp-make-tramp-file-name
              nil ;; method.
              remote-compile-user
              remote-compile-host

diff --git a/lisp/url/url-tramp.el b/lisp/url/url-tramp.el
index 5b9dd8a2682331b50c85372af162369e168e4996..5cf0d804d623506415c7c0b8fdda6a9941ad14f4 100644 (file)
--- a/lisp/url/url-tramp.el
+++ b/lisp/url/url-tramp.el
@@ -48,12 +48,14 @@ In case URL is not convertible, nil is returned."
       (when (url-password obj)
        (password-cache-add
         (tramp-make-tramp-file-name
-         (url-type obj) (url-user obj) nil
-          (url-host obj) port "")
+          (make-tramp-file-name
+          :method (url-type obj) :user (url-user obj)
+           :host (url-host obj)))
         (url-password obj)))
       (tramp-make-tramp-file-name
-       (url-type obj) (url-user obj) nil
-       (url-host obj) port (url-filename obj)))))
+       (make-tramp-file-name
+        :method (url-type obj) :user (url-user obj)
+        :host (url-host obj) :port port :localname (url-filename obj))))))
 
 (defun url-tramp-convert-tramp-to-url (file)
   "Convert FILE, a Tramp file name, to a URL.