[Emacs-diffs] master f1f1687: Fix Bug#33141

[Michael Albinus]

branch: master
commit f1f1687fcd8d48cd519c0f2977bcecbf394a7f01
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <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-compat.el | 3 +++
 lisp/net/tramp.el        | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index ec8e545..15b5a49 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -269,4 +269,7 @@ A nil value for either argument stands for the current 
time."
 
 ;;; TODO:
 
+;; * When we get rid of Emacs 24, replace "(mapconcat 'identity" by
+;;   "(string-join".
+
 ;;; tramp-compat.el ends here
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2e6cdf9..a124665 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1439,7 +1439,9 @@ the form (METHOD USER DOMAIN HOST PORT LOCALNAME 
&optional HOP)."
              localname (nth 5 args)
              hop (nth 6 args))))
 
-    (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))