mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

* net/tramp.el (tramp-do-copy-or-rename-file): Fix check for

Browse source 
overwriting when NEWNAME is a local file.
This commit is contained in:
Michael Albinus 2008-03-30 18:08:20 +00:00
parent 0c61d9814b
commit da1975d727
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/misc/ChangeLog
View file

@ -4,6 +4,8 @@
dbus-call-method.
(Receiving Method Calls): The timeout can be set by the calling client.
* trampver.texi: Update release number.
2008-03-29 Reiner Steib <Reiner.Steib@gmx.de>
* gnus.texi (Top): Fix version. Add SASL.

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2008-03-30 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-do-copy-or-rename-file): Fix check for
overwriting when NEWNAME is a local file.
* net/trampver.el: Update release number.
2008-03-30 Alexandre Julliard <julliard@winehq.org>
* vc-git.el: Make vc-status display information about copies,

9
lisp/net/tramp.el
View file

@ -2955,11 +2955,10 @@ and `rename'. FILENAME and NEWNAME must be absolute file names."
(let ((t1 (tramp-tramp-file-p filename))
(t2 (tramp-tramp-file-p newname)))
(unless ok-if-already-exists
(when (and t2 (file-exists-p newname))
(with-parsed-tramp-file-name newname nil
(tramp-error
v 'file-already-exists "File %s already exists" newname))))
(when (and (not ok-if-already-exists) (file-exists-p newname))
(with-parsed-tramp-file-name (if t1 filename newname) nil
(tramp-error
v 'file-already-exists "File %s already exists" newname)))
(prog1
(cond