From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 5 May 2011 09:48:43 +0000 (+0200)
Subject: * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Fix
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~100
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23c22e9aa191007500e6d98be7d4645a4baca723;p=emacs.git

* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Fix
port computation bug.  (Bug#8618)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ec1773b699..1f13abbf93b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Fix
+	port computation bug.  (Bug#8618)
+
 2011-05-05  Glenn Morris  <rgm@gnu.org>
 
 	* allout-widgets.el (allout-widgets-mode-inhibit): Declare before use.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 81e955ebbf8..cc404baef06 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2260,8 +2260,8 @@ The method used must be an out-of-band method."
 	(setq host (tramp-file-name-host v)
 	      port "")
 	(when (string-match tramp-host-with-port-regexp host)
-	  (setq host (string-to-number (match-string 1 host))
-		port (string-to-number (match-string 2 host))))
+	  (setq port (string-to-number (match-string 2 host))
+		host (string-to-number (match-string 1 host))))
 
 	;; Compose copy command.
 	(setq spec (format-spec-make