From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 29 Jun 2009 21:09:02 +0000 (+0000)
Subject: * net/tramp.el (tramp-do-copy-or-rename-file-directly): Set file
X-Git-Tag: emacs-pretest-23.0.96~64
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee1ce167c84e6335665bf62f8a5556b5273bbd2b;p=emacs.git

* net/tramp.el (tramp-do-copy-or-rename-file-directly): Set file
modes mandatory.  (Bug#3712)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 383c78b1ca8..57de2bf718f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-do-copy-or-rename-file-directly): Set file
+	modes mandatory.  (Bug#3712)
+
 2009-06-28  Glenn Morris  <rgm@gnu.org>
 
 	* autorevert.el (global-auto-revert-non-file-buffers)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5b51d6cc966..fdc1e276994 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3336,9 +3336,8 @@ the uid and gid from FILENAME."
 		  (error)))))))))
 
       ;; Set the time and mode. Mask possible errors.
-      ;; Won't be applied for 'rename.
       (condition-case nil
-	  (when (and keep-date (not preserve-uid-gid))
+	  (when keep-date
 	    (set-file-times newname (nth 5 (file-attributes filename)))
 	    (set-file-modes newname (tramp-default-file-modes filename)))
 	(error)))))