From: Michael Albinus <albinus@detlef>
Date: Sun, 11 Jul 2010 08:28:04 +0000 (+0200)
Subject: * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~78^2~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3277c1ee3a17ed3102aad149e6ba7341d3e579b5;p=emacs.git

* net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
empty argument to gvfs-copy.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc5e087529e..e01bebef0ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-11  Magnus Henoch  <magnus.henoch@gmail.com>
+
+	* net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
+	empty argument to gvfs-copy.
+
 2010-07-10  Aleksei Gusev  <aleksei.gusev@gmail.com>  (tiny change)
 
 	* progmodes/compile.el (compilation-error-regexp-alist-alist): Add
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index a984dd37fd8..202eaf59835 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -551,11 +551,14 @@ is no information where to trace the message.")
 	 (tramp-message v 4 "`copy-file' failed, trying `gvfs-copy'")
 	 (unless
 	     (zerop
-	      (tramp-gvfs-send-command
-	       v "gvfs-copy"
-	       (if (or keep-date preserve-uid-gid) "--preserve" "")
-	       (tramp-gvfs-url-file-name filename)
-	       (tramp-gvfs-url-file-name newname)))
+	      (let ((args
+		     (append (if (or keep-date preserve-uid-gid)
+				 (list "--preserve")
+			       nil)
+			     (list
+			      (tramp-gvfs-url-file-name filename)
+			      (tramp-gvfs-url-file-name newname)))))
+		(apply 'tramp-gvfs-send-command v "gvfs-copy" args)))
 	   ;; Propagate the error.
 	   (tramp-error v (car err) "%s" (cdr err)))))))