[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 5ab767b 1/3: Make tramp-ssh-controlmaster-options a
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 5ab767b 1/3: Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master. |
Date: |
Sat, 07 Mar 2015 20:02:54 +0000 |
branch: master
commit 5ab767b8dcea50b4d02c3910d19c223a5402f99d
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 0b277c7..9556dfd 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 Stefan Monnier <address@hidden>
* battery.el (battery-echo-area-format): Simplify default.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 953525f..7661a4c 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
-(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