Commit 5ab767b8 authored by Michael Albinus's avatar Michael Albinus
Browse files

Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.

Fixes: debbugs:20015

* net/tramp.el (tramp-ssh-controlmaster-options): Make it a defcustom.
parent 35e2b6ab
2015-03-07 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-ssh-controlmaster-options): Make it a
defcustom. (Bug#20015)
2015-03-07 Stefan Monnier <monnier@iro.umontreal.ca>
 
* battery.el (battery-echo-area-format): Simplify default.
......
......@@ -308,7 +308,7 @@ started on the local host. You should specify a remote host
useful only in combination with `tramp-default-proxies-alist'.")
;;;###tramp-autoload
(defconst tramp-ssh-controlmaster-options
(defcustom tramp-ssh-controlmaster-options
(let ((result "")
(case-fold-search t))
(ignore-errors
......@@ -334,7 +334,10 @@ useful only in combination with `tramp-default-proxies-alist'.")
(setq result (concat result " -o ControlPersist=no")))))))
result)
"Call ssh to detect whether it supports the Control* arguments.
Return a string to be used in `tramp-methods'.")
Return a string to be used in `tramp-methods'."
:group 'tramp
:version "24.5"
:type 'string)
;;;###tramp-autoload
(defcustom tramp-use-ssh-controlmaster-options
......
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