From 81822823191a8b7dc5f016780c6b667e7b68228c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 7 Mar 2015 21:01:01 +0100 Subject: [PATCH] Revert "Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master." This reverts commit 5ab767b8dcea50b4d02c3910d19c223a5402f99d. --- lisp/ChangeLog | 5 ----- lisp/net/tramp.el | 7 ++----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9556dfdbc42..0b277c7c518 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,3 @@ -2015-03-07 Michael Albinus - - * net/tramp.el (tramp-ssh-controlmaster-options): Make it a - defcustom. (Bug#20015) - 2015-03-07 Stefan Monnier * battery.el (battery-echo-area-format): Simplify default. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 7661a4ca19c..953525f37e4 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -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 -(defcustom tramp-ssh-controlmaster-options +(defconst tramp-ssh-controlmaster-options (let ((result "") (case-fold-search t)) (ignore-errors @@ -334,10 +334,7 @@ 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'." - :group 'tramp - :version "24.5" - :type 'string) +Return a string to be used in `tramp-methods'.") ;;;###tramp-autoload (defcustom tramp-use-ssh-controlmaster-options -- 2.11.4.GIT