aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp-gvfs.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index fe5a98909e0..1d1b04b44f8 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -683,7 +683,6 @@ file names."
683 (let ((t1 (tramp-tramp-file-p filename)) 683 (let ((t1 (tramp-tramp-file-p filename))
684 (t2 (tramp-tramp-file-p newname)) 684 (t2 (tramp-tramp-file-p newname))
685 (equal-remote (tramp-equal-remote filename newname)) 685 (equal-remote (tramp-equal-remote filename newname))
686 (file-operation (intern (format "%s-file" op)))
687 (gvfs-operation (if (eq op 'copy) "gvfs-copy" "gvfs-move")) 686 (gvfs-operation (if (eq op 'copy) "gvfs-copy" "gvfs-move"))
688 (msg-operation (if (eq op 'copy) "Copying" "Renaming"))) 687 (msg-operation (if (eq op 'copy) "Copying" "Renaming")))
689 688
@@ -698,9 +697,11 @@ file names."
698 697
699 ;; We cannot copy or rename directly. 698 ;; We cannot copy or rename directly.
700 (let ((tmpfile (tramp-compat-make-temp-file filename))) 699 (let ((tmpfile (tramp-compat-make-temp-file filename)))
701 (funcall 700 (if (eq op 'copy)
702 file-operation filename tmpfile t keep-date preserve-uid-gid 701 (copy-file
703 preserve-extended-attributes) 702 filename tmpfile t keep-date preserve-uid-gid
703 preserve-extended-attributes)
704 (rename-file filename tmpfile t))
704 (rename-file tmpfile newname ok-if-already-exists)) 705 (rename-file tmpfile newname ok-if-already-exists))
705 706
706 ;; Direct action. 707 ;; Direct action.