[Emacs-diffs] emacs-26 b8b42c2: Fix Bug#33141

[Andreas Schwab]

branch: emacs-26
commit b8b42c23151298565e4354b38d7060e91465daed
Author: Michael Albinus <address@hidden>
Commit: Andreas Schwab <address@hidden>

    Fix Bug#33141
    
    * lisp/net/tramp.el (tramp-make-tramp-file-name): Avoid check for
    empty method with simplified `tramp-syntax'.  (Bug#33141)
---
 lisp/net/tramp.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e9f5f7d..5fa9f9a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1374,7 +1374,9 @@ default values are used."
     (method user domain host port localname &optional hop)
   "Constructs a Tramp file name from METHOD, USER, HOST and LOCALNAME.
 When not nil, optional DOMAIN, PORT and HOP are used."
-  (when (zerop (length method))
+  ;; Unless `tramp-syntax' is `simplified', we need a method.
+  (when (and (not (zerop (length tramp-postfix-method-format)))
+             (zerop (length method)))
     (signal 'wrong-type-argument (list 'stringp method)))
   (concat tramp-prefix-format hop
          (unless (zerop (length tramp-postfix-method-format))