[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 8318dec 3/4: ; Submit changes promised last commit
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 8318dec 3/4: ; Submit changes promised last commit already |
Date: |
Wed, 14 Oct 2015 18:16:35 +0000 |
branch: master
commit 8318dec8e167a3c688534e3f9faff862b7e374ac
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
; Submit changes promised last commit already
---
lisp/net/tramp-sh.el | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index c02287d..1753c73 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