[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       08/03/30 18:04:55

Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -b -r1.184 -r1.185
--- tramp.el    21 Mar 2008 18:00:17 -0000      1.184
+++ tramp.el    30 Mar 2008 18:04:54 -0000      1.185
@@ -2955,11 +2955,10 @@
   (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
+    (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))))
+        v 'file-already-exists "File %s already exists" newname)))
 
     (prog1
        (cond