mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Revert "Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master."

Browse source 
This reverts commit 5ab767b8dc.
This commit is contained in:
Michael Albinus 2015-03-07 21:01:01 +01:00
parent 5ab767b8dc
commit 8182282319
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,8 +1,3 @@
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 Stefan Monnier <monnier@iro.umontreal.ca> 2015-03-07 Stefan Monnier <monnier@iro.umontreal.ca>
* battery.el (battery-echo-area-format): Simplify default. * battery.el (battery-echo-area-format): Simplify default.

7
lisp/net/tramp.el
View file

@ -308,7 +308,7 @@ started on the local host. You should specify a remote host
useful only in combination with `tramp-default-proxies-alist'.") useful only in combination with `tramp-default-proxies-alist'.")
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-ssh-controlmaster-options (defconst tramp-ssh-controlmaster-options
(let ((result "") (let ((result "")
(case-fold-search t)) (case-fold-search t))
(ignore-errors (ignore-errors
@ -334,10 +334,7 @@ useful only in combination with `tramp-default-proxies-alist'.")
(setq result (concat result " -o ControlPersist=no"))))))) (setq result (concat result " -o ControlPersist=no")))))))
result) result)
"Call ssh to detect whether it supports the Control* arguments. "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 ;;;###tramp-autoload
(defcustom tramp-use-ssh-controlmaster-options (defcustom tramp-use-ssh-controlmaster-options