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
a9327a0a
Commit
a9327a0a
authored
Jun 07, 2017
by
Michael Albinus
Browse files
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Fix port handling.
parent
62523863
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
7 deletions
+1
-7
lisp/net/tramp-sh.el
lisp/net/tramp-sh.el
+1
-7
No files found.
lisp/net/tramp-sh.el
View file @
a9327a0a
...
@@ -4720,7 +4720,7 @@ connection if a previous connection has died for some reason."
...
@@ -4720,7 +4720,7 @@ connection if a previous connection has died for some reason."
(l-method (tramp-file-name-method hop))
(l-method (tramp-file-name-method hop))
(l-user (tramp-file-name-user hop))
(l-user (tramp-file-name-user hop))
(l-host (tramp-file-name-host hop))
(l-host (tramp-file-name-host hop))
(
l-port
nil
)
(l-port
(tramp-file-name-port hop)
)
(login-program
(login-program
(tramp-get-method-parameter hop 'tramp-login-program))
(tramp-get-method-parameter hop 'tramp-login-program))
(login-args
(login-args
...
@@ -4755,12 +4755,6 @@ connection if a previous connection has died for some reason."
...
@@ -4755,12 +4755,6 @@ connection if a previous connection has died for some reason."
(when (and process-name async-args)
(when (and process-name async-args)
(setq login-args (append async-args login-args)))
(setq login-args (append async-args login-args)))
;; Check for port number. Until now, there's no
;; need for handling like method, user, host.
(
when
(
string-match
tramp-host-with-port-regexp
l-host
)
(
setq
l-port
(
match-string
2
l-host
)
l-host
(
match-string
1
l-host
)))
;; Check, whether there is a restricted shell.
;; Check, whether there is a restricted shell.
(dolist (elt tramp-restricted-shell-hosts-alist)
(dolist (elt tramp-restricted-shell-hosts-alist)
(when (string-match elt tramp-current-host)
(when (string-match elt tramp-current-host)
...
...
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