[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100171: * files.el (backup-by-copying-when-mismatch): Make it a buffer local

[Michael Albinus]

------------------------------------------------------------
revno: 100171
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-11-06 15:04:23 +0100
message:
  * 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'.
modified:
  lisp/ChangeLog
  lisp/files.el
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-06 10:08:33 +0000
+++ b/lisp/ChangeLog    2010-11-06 14:04:23 +0000
@@ -1,3 +1,11 @@
+2010-11-06  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * ls-lisp.el (insert-directory): Doc fix.  (bug#7285)

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2010-09-05 22:03:56 +0000
+++ b/lisp/files.el     2010-11-06 14:04:23 +0000
@@ -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.

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-10-30 16:28:17 +0000
+++ b/lisp/net/tramp.el 2010-11-06 14:04:23 +0000
@@ -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))