Minor Tramp fixes

* lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file):
Fix a bug when renaming.

* test/lisp/net/tramp-tests.el (tramp-test21-file-links): Extend test.
(tramp-test42-delay-load, tramp-test42-remote-load-path):
Skip unless Emacs >= 26.

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."
     (let ((t1 (tramp-tramp-file-p filename))
           (t2 (tramp-tramp-file-p newname))
           (equal-remote (tramp-equal-remote filename newname))
-          (file-operation (intern (format "%s-file" op)))
           (gvfs-operation (if (eq op 'copy) "gvfs-copy" "gvfs-move"))
           (msg-operation (if (eq op 'copy) "Copying" "Renaming")))
 
@@ -698,9 +697,11 @@ file names."
 
             ;; We cannot copy or rename directly.
             (let ((tmpfile (tramp-compat-make-temp-file filename)))
-              (funcall
-               file-operation filename tmpfile t keep-date preserve-uid-gid
-               preserve-extended-attributes)
+              (if (eq op 'copy)
+                  (copy-file
+                   filename tmpfile t keep-date preserve-uid-gid
+                   preserve-extended-attributes)
+                (rename-file filename tmpfile t))
               (rename-file tmpfile newname ok-if-already-exists))
 
           ;; Direct action.