emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master a9327a0: * lisp/net/tramp-sh.el (tramp-maybe-open-c


From: Michael Albinus
Subject: [Emacs-diffs] master a9327a0: * lisp/net/tramp-sh.el (tramp-maybe-open-connection): Fix port handling.
Date: Wed, 7 Jun 2017 10:24:36 -0400 (EDT)

branch: master
commit a9327a0afc23d00636b2c3b0ef767de34882bc87
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    * lisp/net/tramp-sh.el (tramp-maybe-open-connection): Fix port handling.
---
 lisp/net/tramp-sh.el | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 70481ab..b2d70fe 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]