Mercurial > emacs
changeset 102940:c9dbbc9ce416
* tramp.el (tramp-do-copy-or-rename-file-directly): Overwrite
always the tmpfile. (Bug#2962).
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sun, 12 Apr 2009 19:26:06 +0000 |
| parents | 79cc92e2f509 |
| children | 8a26453a599a |
| files | lisp/net/tramp.el |
| diffstat | 1 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/tramp.el Sun Apr 12 15:19:58 2009 +0000 +++ b/lisp/net/tramp.el Sun Apr 12 19:26:06 2009 +0000 @@ -3255,8 +3255,8 @@ ;; We can do it directly with `tramp-send-command' ((let (file-name-handler-alist) (and (file-readable-p (concat prefix localname1)) - (file-writable-p - (file-name-directory (concat prefix localname2))))) + (file-writable-p + (file-name-directory (concat prefix localname2))))) (tramp-do-copy-or-rename-file-directly op (concat prefix localname1) (concat prefix localname2) ok-if-already-exists keep-date t) @@ -3287,11 +3287,11 @@ (t2 (if (eq op 'copy) (tramp-compat-copy-file - localname1 tmpfile ok-if-already-exists + localname1 tmpfile t keep-date preserve-uid-gid) (tramp-run-real-handler 'rename-file - (list localname1 tmpfile ok-if-already-exists))) + (list localname1 tmpfile t))) ;; We must change the ownership as local user. (tramp-set-file-uid-gid tmpfile @@ -7758,9 +7758,6 @@ ;; Functions for file-name-handler-alist: ;; diff-latest-backup-file -- in diff.el ;; dired-uncache -- this will be needed when we do insert-directory caching -;; file-name-sans-versions -- use primitive? -;; get-file-buffer -- use primitive -;; vc-registered ;; arch-tag: 3a21a994-182b-48fa-b0cd-c1d9fede424a ;;; tramp.el ends here