[Emacs-diffs] emacs/lisp/net tramp.el [EMACS_23_1_RC]

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Michael Albinus <albinus>       09/06/29 21:05:06

Modified files:
        lisp/net       : tramp.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.236&r2=1.236.2.1

Patches:
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.236
retrieving revision 1.236.2.1
diff -u -b -r1.236 -r1.236.2.1
--- tramp.el    7 Jun 2009 16:16:05 -0000       1.236
+++ tramp.el    29 Jun 2009 21:05:05 -0000      1.236.2.1
@@ -3336,9 +3336,8 @@
                  (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)))))