Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
a336b2ea
Commit
a336b2ea
authored
Jun 03, 2014
by
Michael Albinus
Browse files
Fix Bug#17653.
* net/tramp.el (tramp-ssh-controlmaster-options): Improve search regexp.
parent
e7477c9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/net/tramp.el
lisp/net/tramp.el
+5
-4
No files found.
lisp/ChangeLog
View file @
a336b2ea
2014-06-03 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-ssh-controlmaster-options): Improve search
regexp. (Bug#17653)
2014-06-03 Glenn Morris <rgm@gnu.org>
* emacs-lisp/package.el (package-pinned-packages): Doc fix.
...
...
lisp/net/tramp.el
View file @
a336b2ea
...
...
@@ -302,18 +302,19 @@ useful only in combination with `tramp-default-proxies-alist'.")
;;;###tramp-autoload
(
defconst
tramp-ssh-controlmaster-options
(
let
((
result
""
))
(
let
((
result
""
)
(
case-fold-search
t
))
(
ignore-errors
(
with-temp-buffer
(
call-process
"ssh"
nil
t
nil
"-o"
"ControlMaster"
)
(
goto-char
(
point-min
))
(
when
(
search-forward-regexp
"
M
issing
ControlMaster
argument"
nil
t
)
(
when
(
search-forward-regexp
"
m
issing
.+
argument"
nil
t
)
(
setq
result
"-o ControlPath=%t.%%r@%%h:%%p -o ControlMaster=auto"
)))
(
when
result
(
unless
(
zerop
(
length
result
))
(
with-temp-buffer
(
call-process
"ssh"
nil
t
nil
"-o"
"ControlPersist"
)
(
goto-char
(
point-min
))
(
when
(
search-forward-regexp
"
M
issing
ControlPersist
argument"
nil
t
)
(
when
(
search-forward-regexp
"
m
issing
.+
argument"
nil
t
)
(
setq
result
(
concat
result
" -o ControlPersist=no"
))))))
result
)
"Call ssh to detect whether it supports the Control* arguments.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment