Merge from emacs-23

[gnu-emacs] / lisp / net / tramp.el

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1ca46d213d3a959df4b7ed06584802ddbdf5c3c3..e5ebe81ce292b5e1b3410987bc83cbe3f85152e4 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2864,8 +2864,7 @@ User is always 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)))
+             (set (make-local-variable 'backup-by-copying-when-mismatch) t)))
          (when (and (stringp local-copy)
                     (or remote-copy (null tramp-temp-buffer-file-name)))
            (delete-file local-copy))