[Emacs-diffs] /srv/bzr/emacs/trunk r102467: * files.el (backup-by-copying-when-mismatch): The default value is

[Michael Albinus]

------------------------------------------------------------
revno: 102467
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2010-11-21 20:39:21 +0100
message:
  * 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'.
modified:
  lisp/ChangeLog
  lisp/files.el
  lisp/net/tramp.el
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-21 18:29:08 +0000
+++ b/lisp/ChangeLog    2010-11-21 19:39:21 +0000
@@ -1,3 +1,12 @@
+2010-11-21  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * tool-bar.el (tool-bar-setup): Remove save as, print and customize.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2010-11-18 03:54:14 +0000
+++ b/lisp/files.el     2010-11-21 19:39:21 +0000
@@ -115,13 +115,14 @@
   :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)

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-11-20 13:12:27 +0000
+++ b/lisp/net/tramp.el 2010-11-21 19:39:21 +0000
@@ -2861,12 +2861,7 @@
            (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))

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2010-11-14 02:09:11 +0000
+++ b/lisp/startup.el   2010-11-21 19:39:21 +0000
@@ -466,9 +466,6 @@
     ;; `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,