mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-02 20:16:25 +00:00
Code Issues Releases Activity

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

Browse Source 
now t.

* startup.el (normal-top-level):
* net/tramp.el (tramp-handle-insert-file-contents): Do not set
`backup-by-copying-when-mismatch'.
This commit is contained in:
Michael Albinus 2010-11-21 20:39:21 +01:00
parent 77af54d7c2
commit e274eb13e0
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ChangeLog
View File

@ -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> 2010-11-21 Jan Djärv <jan.h.d@swipnet.se>
* tool-bar.el (tool-bar-setup): Remove save as, print and customize. * tool-bar.el (tool-bar-setup): Remove save as, print and customize.

3
lisp/files.el
View File

@ -115,13 +115,14 @@ This variable is relevant only if `backup-by-copying' is nil."
:type 'boolean :type 'boolean
:group 'backup) :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. "Non-nil means create backups by copying if this preserves owner or group.
Renaming may still be used (subject to control of other variables) 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; 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 that is, for files which are owned by you and whose group matches
the default for a new file created there by you. the default for a new file created there by you.
This variable is relevant only if `backup-by-copying' is nil." This variable is relevant only if `backup-by-copying' is nil."
:version "24.1"
:type 'boolean :type 'boolean
:group 'backup) :group 'backup)
(put 'backup-by-copying-when-mismatch 'permanent-local t) (put 'backup-by-copying-when-mismatch 'permanent-local t)

7
lisp/net/tramp.el
View File

@ -2861,12 +2861,7 @@ User is always nil."
(setq buffer-file-name filename) (setq buffer-file-name filename)
(setq buffer-read-only (not (file-writable-p filename))) (setq buffer-read-only (not (file-writable-p filename)))
(set-visited-file-modtime) (set-visited-file-modtime)
(set-buffer-modified-p nil) (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)))
(when (and (stringp local-copy) (when (and (stringp local-copy)
(or remote-copy (null tramp-temp-buffer-file-name))) (or remote-copy (null tramp-temp-buffer-file-name)))
(delete-file local-copy)) (delete-file local-copy))

3
lisp/startup.el
View File

@ -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. ;; `user-full-name' is now known; reset its standard-value here.
(put 'user-full-name 'standard-value (put 'user-full-name 'standard-value
(list (default-value 'user-full-name))) (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. ;; Look in each dir in load-path for a subdirs.el file.
;; If we find one, load it, which will add the appropriate subdirs ;; If we find one, load it, which will add the appropriate subdirs
;; of that dir into load-path, ;; of that dir into load-path,