aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2023-03-21 21:24:13 +0100
committerMichael Albinus2023-03-21 21:24:13 +0100
commit4a5ff4d9c6a7d28f18cee7276a3c6febbee0c93e (patch)
tree2f5ea3769c29753dd69e704b53d1e167c5e85078
parent0d5036061b544f5a306ccd275502f608ec9d3f25 (diff)
downloademacs-4a5ff4d9c6a7d28f18cee7276a3c6febbee0c93e.tar.gz
emacs-4a5ff4d9c6a7d28f18cee7276a3c6febbee0c93e.zip
Invert variable alias declaration in Tramp
* lisp/net/tramp-sh.el (tramp-use-ssh-controlmaster-options): Invert alias declaration. (Bug#62295, Bug#62329)
-rw-r--r--lisp/net/tramp-sh.el8
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 24e90447b24..401cec0e28d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -106,6 +106,9 @@ detected as prompt when being sent on echoing hosts, therefore.")
106(defconst tramp-end-of-heredoc (md5 tramp-end-of-output) 106(defconst tramp-end-of-heredoc (md5 tramp-end-of-output)
107 "String used to recognize end of heredoc strings.") 107 "String used to recognize end of heredoc strings.")
108 108
109(define-obsolete-variable-alias
110 'tramp-use-ssh-controlmaster-options 'tramp-use-connection-share "30.1")
111
109(defcustom tramp-use-connection-share (not (eq system-type 'windows-nt)) 112(defcustom tramp-use-connection-share (not (eq system-type 'windows-nt))
110 "Whether to use connection share in ssh or PuTTY. 113 "Whether to use connection share in ssh or PuTTY.
111Set it to t, if you want Tramp to apply respective options. These 114Set it to t, if you want Tramp to apply respective options. These
@@ -122,11 +125,6 @@ Set it to `suppress' if you want to disable settings in your
122 ;; Check with (safe-local-variable-p 'tramp-use-connection-share 'suppress) 125 ;; Check with (safe-local-variable-p 'tramp-use-connection-share 'suppress)
123 :safe (lambda (val) (and (memq val '(t nil suppress)) t))) 126 :safe (lambda (val) (and (memq val '(t nil suppress)) t)))
124 127
125(defvaralias 'tramp-use-connection-share 'tramp-use-ssh-controlmaster-options)
126(make-obsolete-variable
127 'tramp-use-ssh-controlmaster-options
128 "Use `tramp-use-connection-share' instead" "30.1")
129
130(defvar tramp-ssh-controlmaster-options nil 128(defvar tramp-ssh-controlmaster-options nil
131 "Which ssh Control* arguments to use. 129 "Which ssh Control* arguments to use.
132 130