[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100143: * net/tramp.el (tramp-handle-insert-file-contents): For root,

[Michael Albinus]

------------------------------------------------------------
revno: 100143
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-10-30 18:28:17 +0200
message:
  * net/tramp.el (tramp-handle-insert-file-contents): For root,
  preserve owner and group when editing files.  (Bug#7289)
  
  Please contact me, if you have problems syncing with the trunk.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-29 07:48:10 +0000
+++ b/lisp/ChangeLog    2010-10-30 16:28:17 +0000
@@ -1,3 +1,8 @@
+2010-10-30  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-handle-insert-file-contents): For root,
+       preserve owner and group when editing files.  (Bug#7289)
+
 2010-10-29  Glenn Morris  <address@hidden>
 
        * speedbar.el (speedbar-mode):

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-10-21 06:33:47 +0000
+++ b/lisp/net/tramp.el 2010-10-30 16:28:17 +0000
@@ -5008,7 +5008,11 @@
            (setq buffer-file-name filename)
            (setq buffer-read-only (not (file-writable-p filename)))
            (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 (file-remote-p filename 'user) "root")
+             (set (make-local-variable 'backup-by-copying-when-mismatch) t)
+             (put 'backup-by-copying-when-mismatch 'permanent-local t)))
          (when (and (stringp local-copy)
                     (or remote-copy (null tramp-temp-buffer-file-name)))
            (delete-file local-copy))