* files.el (backup-buffer-copy): Call `copy-file' with non-nil

preserve-uid-gid.

* net/ange-ftp.el (ange-ftp-copy-file): Add PRESERVE-UID-GID for
compatibility.  It is not used, though.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4573cb384996f3e8ed167871b6a8292c9472f4d0..9aa1b8070c9368a4508b06c4b154d14b31ba588f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-21  Michael Albinus  <michael.albinus@gmx.de>
+
+       * files.el (backup-buffer-copy): Call `copy-file' with non-nil
+       preserve-uid-gid.
+
+       * net/ange-ftp.el (ange-ftp-copy-file): Add PRESERVE-UID-GID for
+       compatibility.  It is not used, though.
+
 2007-10-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * progmodes/gud.el (gud-target-name): Move definition before use.

diff --git a/lisp/files.el b/lisp/files.el
index 6d03ad24dbe608b92b75b0dc1f2aa30f4eae7a46..b2af5c2041484c8d72ae1e630a274454cf93532d 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3204,13 +3204,13 @@ BACKUPNAME is the backup file name, which is the old file renamed."
          (set-default-file-modes ?\700)
          (when (condition-case nil
                    ;; Try to overwrite old backup first.
-                   (copy-file from-name to-name t t)
+                   (copy-file from-name to-name t t t)
                  (error t))
            (while (condition-case nil
                       (progn
                         (when (file-exists-p to-name)
                           (delete-file to-name))
-                        (copy-file from-name to-name nil t)
+                        (copy-file from-name to-name nil t t)
                         nil)
                     (file-already-exists t))
              ;; The file was somehow created by someone else between

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 9962fd14613b77b144771b4abcce74deb6a1a054..432effe5547b6d28d8e7d003552b1eae7c72f4c4 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -3813,7 +3813,7 @@ Value is (0 0) if the modification time cannot be determined."
     (ange-ftp-call-cont cont result line)))
 
 (defun ange-ftp-copy-file (filename newname &optional ok-if-already-exists
-                                   keep-date)
+                                   keep-date preserve-uid-gid)
   (interactive "fCopy file: \nFCopy %s to file: \np")
   (ange-ftp-copy-file-internal filename
                               newname