* 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 383c78b1ca82e01904175fb0662032d89aca3478..57de2bf718fbcc70631ff878539d616794e21e05 100644 (file)
--- 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 5b51d6cc966318815f9fffc027626148ecf1c740..fdc1e276994b66fd83148b7f25d69d0e39ea2532 100644 (file)
--- 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)))))