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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e4e463e20007d8934f4d5b263bf4a7ea11c150f..96a052d24659c7b78dfaf6de651f250e3e048b2f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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  Eli Zaretskii  <eliz@gnu.org>
 
        * dired.el (dired-delete-file): Doc fix.  (Bug#20021)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2e1fe69460a97b928cf7b158b1d439a47fc08243..dddf501fecc78c1b0609a4620d1b69e9999cce20 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -307,7 +307,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
@@ -333,7 +333,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