diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp-compat.el | 3 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index ec8e54509d1..15b5a4958c6 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 2e6cdf999a5..a1246659d8d 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)) |