* files.el (backup-by-copying-when-mismatch): The default value is

now t.

* startup.el (normal-top-level):
* net/tramp.el (tramp-handle-insert-file-contents): Do not set
`backup-by-copying-when-mismatch'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ac8e56f384cf6d0deb4947bbb455cf92141dd3d..d82eeac7788df088fb029efe62fb8089edb32318 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-21  Michael Albinus  <michael.albinus@gmx.de>
+
+       * files.el (backup-by-copying-when-mismatch): The default value is
+       now t.
+
+       * startup.el (normal-top-level):
+       * net/tramp.el (tramp-handle-insert-file-contents): Do not set
+       `backup-by-copying-when-mismatch'.
+
 2010-11-21  Jan Djärv  <jan.h.d@swipnet.se>
 
        * tool-bar.el (tool-bar-setup): Remove save as, print and customize.

diff --git a/lisp/files.el b/lisp/files.el
index 3b130a20d2bcae76909dde50080f0ec328badd5d..42a3f87cb1165fb4998d965a7efe05daf3ff2685 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -115,13 +115,14 @@ This variable is relevant only if `backup-by-copying' is nil."
   :type 'boolean
   :group 'backup)
 
-(defcustom backup-by-copying-when-mismatch nil
+(defcustom backup-by-copying-when-mismatch t
   "Non-nil means create backups by copying if this preserves owner or group.
 Renaming may still be used (subject to control of other variables)
 when it would not result in changing the owner or group of the file;
 that is, for files which are owned by you and whose group matches
 the default for a new file created there by you.
 This variable is relevant only if `backup-by-copying' is nil."
+  :version "24.1"
   :type 'boolean
   :group 'backup)
 (put 'backup-by-copying-when-mismatch 'permanent-local t)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index d5b55064f3d938d9e7066c14b94f4bf030bdc4f4..10b3c7bd04c950424981f73306bd0a7f41543054 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2861,12 +2861,7 @@ User is always nil."
            (setq buffer-file-name filename)
            (setq buffer-read-only (not (file-writable-p filename)))
            (set-visited-file-modtime)
-           (set-buffer-modified-p nil)
-           ;; For root, preserve owner and group when editing files.
-           (when (string-equal
-                  (tramp-file-name-handler 'file-remote-p filename 'user)
-                  "root")
-             (set (make-local-variable 'backup-by-copying-when-mismatch) t)))
+           (set-buffer-modified-p nil))
          (when (and (stringp local-copy)
                     (or remote-copy (null tramp-temp-buffer-file-name)))
            (delete-file local-copy))

diff --git a/lisp/startup.el b/lisp/startup.el
index 8dd76b29741e6690df013a7fc56fe81563609d9f..99189b1df725533b16d4737edc5d9fde1a1f7c2a 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -466,9 +466,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
     ;; `user-full-name' is now known; reset its standard-value here.
     (put 'user-full-name 'standard-value
         (list (default-value 'user-full-name)))
-    ;; For root, preserve owner and group when editing files.
-    (if (equal (user-uid) 0)
-       (setq backup-by-copying-when-mismatch t))
     ;; Look in each dir in load-path for a subdirs.el file.
     ;; If we find one, load it, which will add the appropriate subdirs
     ;; of that dir into load-path,