diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2017-05-23 09:25:03 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-05-23 09:25:03 +0200 |
| commit | 107e60f49db71f1869848f0f0ce5ea7dd057366c (patch) | |
| tree | 80cd579d35f0d79d3ab00c0324415c731ba4778c /lisp | |
| parent | ad2f52a14312b1b33f235103189b033b7ed87ddd (diff) | |
| download | emacs-107e60f49db71f1869848f0f0ce5ea7dd057366c.tar.gz emacs-107e60f49db71f1869848f0f0ce5ea7dd057366c.tar.bz2 emacs-107e60f49db71f1869848f0f0ce5ea7dd057366c.zip | |
Add test for Bug#27009 in tramp-tests.el
* lisp/net/tramp-sh.el (tramp-compute-multi-hops):
Check `tramp-file-name-real-host' for being a local host.
* lisp/net/tramp.el (tramp-postfix-host-regexp): Fix docstring.
* test/lisp/net/tramp-tests.el (tramp-test-temporary-file-directory):
Declare default host for mock method.
(tramp-test29-environment-variables-and-port-numbers): New test.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 9b001a90e78..999de8e8504 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4546,7 +4546,7 @@ Goes through the list `tramp-inline-compress-commands'." ;; host name. (let* ((v (car target-alist)) (method (tramp-file-name-method v)) - (host (tramp-file-name-host v))) + (host (tramp-file-name-real-host v))) (unless (or ;; There are multi-hops. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5b1e478db04..70abb89194d 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -837,7 +837,7 @@ Used in `tramp-make-tramp-file-name'." (defun tramp-postfix-host-regexp () "Regexp matching delimiter between host names and localnames. -nDerived from `tramp-postfix-host-format'." +Derived from `tramp-postfix-host-format'." (regexp-quote (tramp-postfix-host-format))) (defconst tramp-localname-regexp ".*$" @@ -4396,6 +4396,8 @@ Only works for Bourne-like shells." ;; * Use also port to distinguish connections. This is needed for ;; different hosts sitting behind a single router (distinguished by ;; different port numbers). (Tzvi Edelman) +;; Also needed for different systems serve SSH on different ports of +;; the same IP address. (Bug#27009) ;; ;; * Refactor code from different handlers. Start with ;; *-process-file. One idea is to generalize `tramp-send-command' |