]> code.delx.au - gnu-emacs/commit
In Tramp. check ssh Control* options only when needed
authorMichael Albinus <michael.albinus@gmx.de>
Sun, 15 Mar 2015 15:07:03 +0000 (16:07 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sun, 15 Mar 2015 15:07:03 +0000 (16:07 +0100)
commit28caedba0f5c387d9c8e8fc8de26b5399afeb68b
tree1d9b17b2839c9be0fd6148e6e4bb43b04d410d32
parent51e7e463e93708a0e40688f91200e9e9869ec662
In Tramp. check ssh Control* options only when needed

Fixes: debbugs:20015
* net/tramp-adb.el:
* net/tramp-gvfs.el:
* net/tramp-sh.el:
* net/tramp-smb.el: Set tramp-autoload cookie for all defcustoms.

* net/tramp-sh.el (tramp-use-ssh-controlmaster-options):
New defcustom, moved from tramp.el.
(tramp-ssh-controlmaster-options): New defvar, moved from tramp.el
but with a nil initial value.
(tramp-ssh-controlmaster-options): New defun.
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Use it.

* net/tramp.el (tramp-ssh-controlmaster-options)
(tramp-use-ssh-controlmaster-options): Move them to tramp-sh.el.
(tramp-default-method): Do not check for
`tramp-ssh-controlmaster-options'.
lisp/ChangeLog
lisp/net/tramp-adb.el
lisp/net/tramp-gvfs.el
lisp/net/tramp-sh.el
lisp/net/tramp-smb.el
lisp/net/tramp.el