diff lisp/net/tramp.el @ 111449:132f2dfd549f

Merge from emacs-23

--- a/lisp/net/tramp.el	Tue Nov 09 10:29:37 2010 +0000
+++ b/lisp/net/tramp.el	Tue Nov 09 15:07:10 2010 -0500
@@ -2864,8 +2864,7 @@
 	    (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))