diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2017-06-07 16:24:31 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-06-07 16:24:31 +0200 |
| commit | a9327a0afc23d00636b2c3b0ef767de34882bc87 (patch) | |
| tree | 0677f22559c47e994bd3f219c7a08cc869ebcfaf | |
| parent | 62523863780d3894c92f84dd474278eeddc4a0e0 (diff) | |
| download | emacs-a9327a0afc23d00636b2c3b0ef767de34882bc87.tar.gz | |
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Fix port handling.
| -rw-r--r-- | lisp/net/tramp-sh.el | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 70481ab13bf..b2d70fe11ca 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4720,7 +4720,7 @@ connection if a previous connection has died for some reason." (l-method (tramp-file-name-method hop)) (l-user (tramp-file-name-user hop)) (l-host (tramp-file-name-host hop)) - (l-port nil) + (l-port (tramp-file-name-port hop)) (login-program (tramp-get-method-parameter hop 'tramp-login-program)) (login-args @@ -4755,12 +4755,6 @@ connection if a previous connection has died for some reason." (when (and process-name async-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. (dolist (elt tramp-restricted-shell-hosts-alist) (when (string-match elt tramp-current-host) |