diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-09 15:07:10 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-09 15:07:10 -0500 |
| commit | d607b96bc2824116a8fe0e5840ce49da7ce4514f (patch) | |
| tree | 229a11bba88b67e8961db4d10aa8b3725f3a4873 /lisp/net/tramp.el | |
| parent | 27410d0ac3406a341cc90ada064047a7f1ea5209 (diff) | |
| parent | c00980655bc15ca019fd6c559c69601be18f2407 (diff) | |
| download | emacs-d607b96bc2824116a8fe0e5840ce49da7ce4514f.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 1ca46d213d3..e5ebe81ce29 100644 --- 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)) |