[Emacs-diffs] emacs-24 9869d6f: Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.

[Michael Albinus]

branch: emacs-24
commit 9869d6f612e94437ac4a998454ad2d4f833a6ad8
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    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.
---
 lisp/ChangeLog    |    5 +++++
 lisp/net/tramp.el |    7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e4e463..96a052d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-07  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-ssh-controlmaster-options): Make it a
+       defcustom.  (Bug#20015)
+
 2015-03-07  Eli Zaretskii  <address@hidden>
 
        * dired.el (dired-delete-file): Doc fix.  (Bug#20021)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2e1fe69..dddf501 100644
--- 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