diff options
| author | Orivej Desh <orivej@gmx.fr> | 2015-05-25 12:25:39 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2015-05-25 12:25:39 +0200 |
| commit | 93760219ce8bc689e931a190b18a9b9ed027f36d (patch) | |
| tree | 3720f89a5b5fd6bd22de3415fe84eb5b2b203428 | |
| parent | 89035e247591c8d688fce922b7079881aa110f33 (diff) | |
| download | emacs-93760219ce8bc689e931a190b18a9b9ed027f36d.tar.gz | |
Fix IPv6 addresses in Tramp
* lisp/net/tramp-sh.el (tramp-make-copy-program-file-name):
Add sqare brackets around host name.
Copyright-paperwork-exempt: yes
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 55ac778858c..265e7995378 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -5125,12 +5125,14 @@ Return ATTR." "")) (defun tramp-make-copy-program-file-name (vec) - "Create a file name suitable to be passed to `scp' or `nc' and workalikes." + "Create a file name suitable for `scp', `pscp', or `nc' and workalikes." (let ((method (tramp-file-name-method vec)) (user (tramp-file-name-user vec)) (host (tramp-file-name-real-host vec)) (localname (tramp-shell-quote-argument (tramp-file-name-localname vec)))) + (when (string-match tramp-ipv6-regexp host) + (setq host (format "[%s]" host))) (cond ((tramp-get-method-parameter method 'tramp-remote-copy-program) localname) |