diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2017-12-08 16:37:53 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-12-09 11:35:04 +0100 |
| commit | b067fa1f7d2b24b8fdb7f178924eb4e296559738 (patch) | |
| tree | 2e08075c13be89268ff1e87db790d1f0da689995 /lisp/net/tramp-gvfs.el | |
| parent | 6c1a31e43c76ed5c08a4c5bbf2afe4ddc64e9a65 (diff) | |
| download | emacs-b067fa1f7d2b24b8fdb7f178924eb4e296559738.tar.gz emacs-b067fa1f7d2b24b8fdb7f178924eb4e296559738.tar.bz2 emacs-b067fa1f7d2b24b8fdb7f178924eb4e296559738.zip | |
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.
Diffstat (limited to 'lisp/net/tramp-gvfs.el')
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 9 |
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. |