Handle also port and domain in Tramp proxy definitions

* doc/misc/tramp.texi (Multi-hops): Exclude ports and domains from
pattern expansion.

* lisp/net/tramp-cmds.el (tramp-cleanup-all-connections):
Remove ad-hoc proxies.

* lisp/net/tramp-sh.el (tramp-compute-multi-hops): Handle also
port and domain in the proxy.  Propertize ad-hoc proxies.

* lisp/net/tramp.el (tramp-default-proxies-alist): Adapt docstring.

* test/lisp/net/tramp-tests.el (tramp-test02-file-name-dissect)
(tramp-test02-file-name-dissect-simplified)
(tramp-test02-file-name-dissect-separate): Extend tests.

1 files changed, 23 insertions, 17 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index ceda70947c8..4016ece94d3 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -819,12 +819,14 @@ handled properly.  BODY shall not contain a timeout."
       (file-remote-p
        (concat
         "/method1:%u@%h"
-        "|method2:%u@%h"
-        "|method3:user3@host3:/path/to/file"))
-      (format "/%s:%s@%s|%s:%s@%s|%s:%s@%s:"
-              "method1" "user3" "host3"
-              "method2" "user3" "host3"
-              "method3" "user3" "host3")))))
+        "|method2:user2@host2"
+        "|method3:%u@%h"
+        "|method4:user4%domain4@host4#1234:/path/to/file"))
+      (format "/%s:%s@%s|%s:%s@%s|%s:%s@%s|%s:%s@%s:"
+              "method1" "user2" "host2"
+              "method2" "user2" "host2"
+              "method3" "user4" "host4"
+              "method4" "user4%domain4" "host4#1234")))))
 
 (ert-deftest tramp-test02-file-name-dissect-simplified ()
   "Check simplified file name components."
@@ -1134,12 +1136,14 @@ handled properly.  BODY shall not contain a timeout."
             (file-remote-p
              (concat
               "/%u@%h"
+              "|user2@host2"
               "|%u@%h"
-              "|user3@host3:/path/to/file"))
-            (format "/%s@%s|%s@%s|%s@%s:"
-                    "user3" "host3"
-                    "user3" "host3"
-                    "user3" "host3"))))
+              "|user4%domain4@host4#1234:/path/to/file"))
+            (format "/%s@%s|%s@%s|%s@%s|%s@%s:"
+                    "user2" "host2"
+                    "user2" "host2"
+                    "user4" "host4"
+                    "user4%domain4" "host4#1234"))))
 
       ;; Exit.
       (tramp-change-syntax syntax))))
@@ -1780,12 +1784,14 @@ handled properly.  BODY shall not contain a timeout."
             (file-remote-p
              (concat
               "/[method1/%u@%h"
-              "|method2/%u@%h"
-              "|method3/user3@host3]/path/to/file"))
-            (format "/[%s/%s@%s|%s/%s@%s|%s/%s@%s]"
-                    "method1" "user3" "host3"
-                    "method2" "user3" "host3"
-                    "method3" "user3" "host3"))))
+              "|method2/user2@host2"
+              "|method3/%u@%h"
+              "|method4/user4%domain4@host4#1234]/path/to/file"))
+            (format "/[%s/%s@%s|%s/%s@%s|%s/%s@%s|%s/%s@%s]"
+                    "method1" "user2" "host2"
+                    "method2" "user2" "host2"
+                    "method3" "user4" "host4"
+                    "method4" "user4%domain4" "host4#1234"))))
 
       ;; Exit.
       (tramp-change-syntax syntax))))