From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 14 Oct 2015 18:10:14 +0000 (+0200)
Subject: ; Submit changes promised last commit already
X-Git-Tag: emacs-25.0.90~1123
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8318dec8e167a3c688534e3f9faff862b7e374ac;p=emacs.git

; Submit changes promised last commit already
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index c02287d5ccf..1753c73f869 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2457,16 +2457,17 @@ The method used must be an out-of-band method."
 	(setq source (if t1
 			 (tramp-make-copy-program-file-name v)
 		       (shell-quote-argument filename))
-	      target (funcall
+          target (if t2
+                     (tramp-make-copy-program-file-name v)
+                   (shell-quote-argument
+                    (funcall
 		      (if (and (file-directory-p filename)
 			       (string-equal
 				(file-name-nondirectory filename)
 				(file-name-nondirectory newname)))
 			  'file-name-directory
 			'identity)
-		      (if t2
-			  (tramp-make-copy-program-file-name v)
-			(shell-quote-argument newname))))
+                     newname))))
 
 	;; Check for host and port number.  We cannot use
 	;; `tramp-file-name-port', because this returns also