From ba4daf22144e9a68b1797d6a3b621f2b6b16a293 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 1 Nov 2021 12:29:22 +0100 Subject: [PATCH] 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. --- lisp/net/tramp-gvfs.el | 9 +++------ lisp/obsolete/rcompile.el | 6 +++++- lisp/url/url-tramp.el | 10 ++++++---- 3 files changed, 14 insertions(+), 11 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)) diff --git a/lisp/obsolete/rcompile.el b/lisp/obsolete/rcompile.el index ff7d1dcdcea..c8fb9f20985 100644 --- 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 5b9dd8a2682..5cf0d804d62 100644 --- 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. -- 2.39.5