Mercurial > emacs
changeset 111667:daaca509a6d8
* 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'.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sun, 21 Nov 2010 20:39:21 +0100 |
| parents | f57fcf34eb00 |
| children | ccb8652ef52b |
| files | lisp/ChangeLog lisp/files.el lisp/net/tramp.el lisp/startup.el |
| diffstat | 4 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Nov 21 19:29:08 2010 +0100 +++ b/lisp/ChangeLog Sun Nov 21 20:39:21 2010 +0100 @@ -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.
--- a/lisp/files.el Sun Nov 21 19:29:08 2010 +0100 +++ b/lisp/files.el Sun Nov 21 20:39:21 2010 +0100 @@ -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)
--- a/lisp/net/tramp.el Sun Nov 21 19:29:08 2010 +0100 +++ b/lisp/net/tramp.el Sun Nov 21 20:39:21 2010 +0100 @@ -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))
--- a/lisp/startup.el Sun Nov 21 19:29:08 2010 +0100 +++ b/lisp/startup.el Sun Nov 21 20:39:21 2010 +0100 @@ -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,