# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1289052263 -3600
# Node ID 21396378bdf607825d079924f4c0028d40b2806d
# Parent  1062cf507cfa0fe788c5b0c8a83434da8d0a4d07
* files.el (backup-by-copying-when-mismatch): Make it a buffer local
variable (permanent-local).

* net/tramp.el (tramp-handle-insert-file-contents): Do not set
`permanent-local' property for `(backup-by-copying-when-mismatch'.

diff -r 1062cf507cfa -r 21396378bdf6 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Nov 06 12:23:33 2010 +0200
+++ b/lisp/ChangeLog	Sat Nov 06 15:04:23 2010 +0100
@@ -1,3 +1,11 @@
+2010-11-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	* files.el (backup-by-copying-when-mismatch): Make it a buffer local
+	variable (permanent-local).
+
+	* net/tramp.el (tramp-handle-insert-file-contents): Do not set
+	`permanent-local' property for `(backup-by-copying-when-mismatch'.
+
 2010-11-06  Eli Zaretskii  <eliz@gnu.org>
 
 	* ls-lisp.el (insert-directory): Doc fix.  (bug#7285)
diff -r 1062cf507cfa -r 21396378bdf6 lisp/files.el
--- a/lisp/files.el	Sat Nov 06 12:23:33 2010 +0200
+++ b/lisp/files.el	Sat Nov 06 15:04:23 2010 +0100
@@ -123,6 +123,7 @@
 This variable is relevant only if `backup-by-copying' is nil."
   :type 'boolean
   :group 'backup)
+(put 'backup-by-copying-when-mismatch 'permanent-local t)
 
 (defcustom backup-by-copying-when-privileged-mismatch 200
   "Non-nil means create backups by copying to preserve a privileged owner.
diff -r 1062cf507cfa -r 21396378bdf6 lisp/net/tramp.el
--- a/lisp/net/tramp.el	Sat Nov 06 12:23:33 2010 +0200
+++ b/lisp/net/tramp.el	Sat Nov 06 15:04:23 2010 +0100
@@ -5011,8 +5011,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))