* net/tramp.el (tramp-methods): Fix docstring.
(tramp-ssh-controlmaster-options): Rename it from `tramp-ssh-controlmaster-template'. Return a string. (tramp-default-method): Adapt check for `tramp-ssh-controlmaster-options'. * net/tramp-sh.el (tramp-methods): Replace `tramp-ssh-controlmaster-template' by "%c". (tramp-do-copy-or-rename-file-out-of-band) (tramp-maybe-open-connection): Use it in format spec. Ensure, that it is applied for the first hop only.
Showing with 64 additions and 59 deletions