[Emacs-diffs] /srv/bzr/emacs/trunk r100775: * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass

[Michael Albinus]

------------------------------------------------------------
revno: 100775
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2010-07-11 10:28:04 +0200
message:
  * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
  empty argument to gvfs-copy.
modified:
  lisp/ChangeLog
  lisp/net/tramp-gvfs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-07-10 19:47:59 +0000
+++ b/lisp/ChangeLog    2010-07-11 08:28:04 +0000
@@ -1,3 +1,8 @@
+2010-07-11  Magnus Henoch  <address@hidden>
+
+       * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
+       empty argument to gvfs-copy.
+
 2010-07-10  Aleksei Gusev  <address@hidden>  (tiny change)
 
        * progmodes/compile.el (compilation-error-regexp-alist-alist): Add

=== modified file 'lisp/net/tramp-gvfs.el'
--- a/lisp/net/tramp-gvfs.el    2010-06-04 11:26:54 +0000
+++ b/lisp/net/tramp-gvfs.el    2010-07-11 08:28:04 +0000
@@ -551,11 +551,14 @@
         (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)))))))