[Emacs-diffs] trunk r113583: * net/tramp.el (tramp-use-ssh-controlmaster-options): New customer option.

[Michael Albinus]

------------------------------------------------------------
revno: 113583
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2013-07-29 09:47:53 +0200
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1
  lisp/net/tramp.el              tramp.el-20091113204419-o5vbwnq5f7feedwu-2427

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-28 23:19:25 +0000
+++ b/lisp/ChangeLog    2013-07-29 07:47:53 +0000
@@ -1,3 +1,11 @@
+2013-07-29  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * desktop.el (desktop--make-frame): Include `minibuffer' in the

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2013-07-24 13:29:15 +0000
+++ b/lisp/net/tramp-sh.el      2013-07-29 07:47:53 +0000
@@ -2248,7 +2248,10 @@
              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 @@
              (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)

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2013-07-24 13:29:15 +0000
+++ b/lisp/net/tramp.el 2013-07-29 07:47:53 +0000
@@ -305,6 +305,14 @@
     "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