From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 24 Oct 2018 18:56:40 +0000 (+0200)
Subject: Fix Bug#33141
X-Git-Tag: emacs-26.1.91~100
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b8b42c23151298565e4354b38d7060e91465daed;p=emacs.git

Fix Bug#33141

* lisp/net/tramp.el (tramp-make-tramp-file-name): Avoid check for
empty method with simplified `tramp-syntax'.  (Bug#33141)
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e9f5f7d4347..5fa9f9a44d4 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))