diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2015-03-07 21:02:04 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2015-03-07 21:02:04 +0100 |
| commit | 9869d6f612e94437ac4a998454ad2d4f833a6ad8 (patch) | |
| tree | b0efb7cec1aa67d2503706644a70ccb61565902d | |
| parent | 344c6adab932fd329c11d76d7a0fff12d250bba2 (diff) | |
| download | emacs-9869d6f612e94437ac4a998454ad2d4f833a6ad8.tar.gz | |
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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e4e463e200..96a052d2465 100644 --- 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 2e1fe69460a..dddf501fecc 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 |