diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2018-10-24 20:56:40 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2018-11-19 21:48:59 +0100 |
| commit | b8b42c23151298565e4354b38d7060e91465daed (patch) | |
| tree | 846e27b59411a1b98c93774896830ccb7b643d53 | |
| parent | 070e82b96bfadb5a3622607a8c5c97c127ec62db (diff) | |
| download | emacs-b8b42c23151298565e4354b38d7060e91465daed.tar.gz | |
Fix Bug#33141
* lisp/net/tramp.el (tramp-make-tramp-file-name): Avoid check for
empty method with simplified `tramp-syntax'. (Bug#33141)
| -rw-r--r-- | lisp/net/tramp.el | 4 |
1 files changed, 3 insertions, 1 deletions
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)) |