Commit 78822e94 authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/tramp.el (tramp-use-ssh-controlmaster-options): New customer option.

* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Use it.
parent dfc7be39
2013-07-29 Michael Albinus <>
* net/tramp.el (tramp-use-ssh-controlmaster-options): New customer
* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Use it.
2013-07-28 Juanma Barranquero <>
* desktop.el (desktop--make-frame): Include `minibuffer' in the
......@@ -2248,7 +2248,10 @@ The method used must be an out-of-band method."
spec (format-spec-make
?t (tramp-get-connection-property
(tramp-get-connection-process v) "temp-file" ""))
options (format-spec tramp-ssh-controlmaster-options spec)
options (format-spec
(if tramp-use-ssh-controlmaster-options
tramp-ssh-controlmaster-options "")
spec (format-spec-make
?h host ?u user ?p port ?c options
?k (if keep-date " " ""))
......@@ -4416,7 +4419,8 @@ connection if a previous connection has died for some reason."
(let* ((target-alist (tramp-compute-multi-hops vec))
;; We will apply `tramp-ssh-controlmaster-options'
;; only for the first hop.
(options tramp-ssh-controlmaster-options)
(options (if tramp-use-ssh-controlmaster-options
tramp-ssh-controlmaster-options ""))
(process-connection-type tramp-process-connection-type)
(process-adaptive-read-buffering nil)
(coding-system-for-read nil)
......@@ -305,6 +305,14 @@ useful only in combination with `tramp-default-proxies-alist'.")
"Call ssh to detect whether it supports the Control* arguments.
Return a string to be used in `tramp-methods'.")
(defcustom tramp-use-ssh-controlmaster-options
(not (zerop (length tramp-ssh-controlmaster-options)))
"Whether to use `tramp-ssh-controlmaster-options'."
:group 'tramp
:version "24.4"
:type 'boolean)
(defcustom tramp-default-method
;; An external copy method seems to be preferred, because it performs
;; much better for large files, and it hasn't too serious delays
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment