procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/tramp.el (tramp-use-ssh-controlmaster-options): New customer option.

Browse source 
* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Use it.
This commit is contained in:
Michael Albinus 2013-07-29 09:47:53 +02:00
parent dfc7be3975
commit 78822e94cb
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -1,3 +1,11 @@
2013-07-29 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-use-ssh-controlmaster-options): New customer
option.
* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Use it.
2013-07-28 Juanma Barranquero <lekktu@gmail.com>
* desktop.el (desktop--make-frame): Include `minibuffer' in the

8
lisp/net/tramp-sh.el
View file

@ -2248,7 +2248,10 @@ The method used must be an out-of-band method."
spec (format-spec-make
?t (tramp-get-connection-property
(tramp-get-connection-process v) "temp-file" ""))
options (format-spec tramp-ssh-controlmaster-options spec)
options (format-spec
(if tramp-use-ssh-controlmaster-options
tramp-ssh-controlmaster-options "")
spec)
spec (format-spec-make
?h host ?u user ?p port ?c options
?k (if keep-date " " ""))
@ -4416,7 +4419,8 @@ connection if a previous connection has died for some reason."
(let* ((target-alist (tramp-compute-multi-hops vec))
;; We will apply `tramp-ssh-controlmaster-options'
;; only for the first hop.
(options tramp-ssh-controlmaster-options)
(options (if tramp-use-ssh-controlmaster-options
tramp-ssh-controlmaster-options ""))
(process-connection-type tramp-process-connection-type)
(process-adaptive-read-buffering nil)
(coding-system-for-read nil)

8
lisp/net/tramp.el
View file

@ -305,6 +305,14 @@ useful only in combination with `tramp-default-proxies-alist'.")
"Call ssh to detect whether it supports the Control* arguments.
Return a string to be used in `tramp-methods'.")
;;;###tramp-autoload
(defcustom tramp-use-ssh-controlmaster-options
(not (zerop (length tramp-ssh-controlmaster-options)))
"Whether to use `tramp-ssh-controlmaster-options'."
:group 'tramp
:version "24.4"
:type 'boolean)
(defcustom tramp-default-method
;; An external copy method seems to be preferred, because it performs
;; much better for large files, and it hasn't too serious delays