[Emacs-diffs] /srv/bzr/emacs/trunk r104126: * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Fix

[Michael Albinus]

------------------------------------------------------------
revno: 104126
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2011-05-05 11:48:43 +0200
message:
  * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Fix
  port computation bug.  (Bug#8618)
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-05 06:53:29 +0000
+++ b/lisp/ChangeLog    2011-05-05 09:48:43 +0000
@@ -1,3 +1,8 @@
+2011-05-05  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Fix
+       port computation bug.  (Bug#8618)
+
 2011-05-05  Glenn Morris  <address@hidden>
 
        * allout-widgets.el (allout-widgets-mode-inhibit): Declare before use.

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2011-04-25 18:10:17 +0000
+++ b/lisp/net/tramp-sh.el      2011-05-05 09:48:43 +0000
@@ -2260,8 +2260,8 @@
        (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