diff options
| author | Michael Albinus | 2018-10-24 20:56:40 +0200 |
|---|---|---|
| committer | Michael Albinus | 2018-10-24 20:56:40 +0200 |
| commit | f1f1687fcd8d48cd519c0f2977bcecbf394a7f01 (patch) | |
| tree | 6c54cbb4b5d062afc37f69d06ebd68d3102f6c76 | |
| parent | 129ffc2761bc977dc859e7065668cdd997fb4ef7 (diff) | |
| download | emacs-f1f1687fcd8d48cd519c0f2977bcecbf394a7f01.tar.gz emacs-f1f1687fcd8d48cd519c0f2977bcecbf394a7f01.zip | |
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-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." | |||
| 269 | 269 | ||
| 270 | ;;; TODO: | 270 | ;;; TODO: |
| 271 | 271 | ||
| 272 | ;; * When we get rid of Emacs 24, replace "(mapconcat 'identity" by | ||
| 273 | ;; "(string-join". | ||
| 274 | |||
| 272 | ;;; tramp-compat.el ends here | 275 | ;;; 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)." | |||
| 1439 | localname (nth 5 args) | 1439 | localname (nth 5 args) |
| 1440 | hop (nth 6 args)))) | 1440 | hop (nth 6 args)))) |
| 1441 | 1441 | ||
| 1442 | (when (zerop (length method)) | 1442 | ;; Unless `tramp-syntax' is `simplified', we need a method. |
| 1443 | (when (and (not (zerop (length tramp-postfix-method-format))) | ||
| 1444 | (zerop (length method))) | ||
| 1443 | (signal 'wrong-type-argument (list 'stringp method))) | 1445 | (signal 'wrong-type-argument (list 'stringp method))) |
| 1444 | (concat tramp-prefix-format hop | 1446 | (concat tramp-prefix-format hop |
| 1445 | (unless (zerop (length tramp-postfix-method-format)) | 1447 | (unless (zerop (length tramp-postfix-method-format)) |