Fix Bug#28982

* admin/MAINTAINERS: Add test/lisp/url/url-tramp-tests.el.

* lisp/url/url-tramp.el (url-tramp-convert-url-to-tramp)
(url-tramp-convert-tramp-to-url): Adapt to recent Tramp changes.

* test/lisp/url/url-tramp-tests.el: New file.  (Bug#28982)

1 files changed, 33 insertions, 25 deletions

diff --git a/lisp/url/url-tramp.el b/lisp/url/url-tramp.el
index c28cf6c23a1..0b07bd0d1aa 100644
--- a/lisp/url/url-tramp.el
+++ b/lisp/url/url-tramp.el
@@ -37,33 +37,41 @@ They must also be covered by `url-handler-regexp'."
   :type '(repeat string))
 
 (defun url-tramp-convert-url-to-tramp (url)
-  "Convert URL to a Tramp file name."
-  (let ((obj (url-generic-parse-url (and (stringp url) url))))
-    (if (member (url-type obj) url-tramp-protocols)
-        (progn
-          (if (url-password obj)
-              (password-cache-add
-               (tramp-make-tramp-file-name
-                (url-type obj) (url-user obj) (url-host obj) "")
-               (url-password obj))
-            (tramp-make-tramp-file-name
-             (url-type obj) (url-user obj) (url-host obj) (url-filename obj))))
-      url)))
+  "Convert URL to a Tramp file name.
+If URL contains a password, it will be added to the `password-data' cache.
+In case URL is not convertable, nil is returned."
+  (let* ((obj (url-generic-parse-url (and (stringp url) url)))
+         (port
+          (and (natnump (url-portspec obj))
+               (number-to-string (url-portspec obj)))))
+    (when (member (url-type obj) url-tramp-protocols)
+      (when (url-password obj)
+        (password-cache-add
+         (tramp-make-tramp-file-name
+          (url-type obj) (url-user obj) nil
+          (url-host obj) port "")
+         (url-password obj)))
+      (tramp-make-tramp-file-name
+       (url-type obj) (url-user obj) nil
+       (url-host obj) port (url-filename obj)))))
 
 (defun url-tramp-convert-tramp-to-url (file)
-  "Convert FILE, a Tramp file name, to a URL."
-  (let ((obj (ignore-errors (tramp-dissect-file-name file))))
-    (if (member (tramp-file-name-method obj) url-tramp-protocols)
-        (url-recreate-url
-         (url-parse-make-urlobj
-          (tramp-file-name-method obj)
-          (tramp-file-name-user obj)
-          nil ; password.
-          (tramp-file-name-host obj)
-          nil ; port.
-          (tramp-file-name-localname obj)
-          nil nil t)) ; target attributes fullness.
-      file)))
+  "Convert FILE, a Tramp file name, to a URL.
+In case FILE is not convertable, nil is returned."
+  (let* ((obj (ignore-errors (tramp-dissect-file-name file)))
+         (port
+          (and (stringp (tramp-file-name-port obj))
+               (string-to-number (tramp-file-name-port obj)))))
+    (when (member (tramp-file-name-method obj) url-tramp-protocols)
+      (url-recreate-url
+       (url-parse-make-urlobj
+        (tramp-file-name-method obj)
+        (tramp-file-name-user obj)
+        nil ; password.
+        (tramp-file-name-host obj)
+        port
+        (tramp-file-name-localname obj)
+        nil nil t))))) ; target attributes fullness.
 
 ;;;###autoload
 (defun url-tramp-file-handler (operation &rest args)