Mercurial > emacs
comparison lisp/net/tramp.el @ 111449:132f2dfd549f
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 09 Nov 2010 15:07:10 -0500 |
| parents | 029e4783cbae 21396378bdf6 |
| children | 49c1b16ca6b1 |
comparison
equal
deleted
inserted
replaced
| 111448:321fbae3e04d | 111449:132f2dfd549f |
|---|---|
| 2862 (setq buffer-read-only (not (file-writable-p filename))) | 2862 (setq buffer-read-only (not (file-writable-p filename))) |
| 2863 (set-visited-file-modtime) | 2863 (set-visited-file-modtime) |
| 2864 (set-buffer-modified-p nil) | 2864 (set-buffer-modified-p nil) |
| 2865 ;; For root, preserve owner and group when editing files. | 2865 ;; For root, preserve owner and group when editing files. |
| 2866 (when (string-equal (file-remote-p filename 'user) "root") | 2866 (when (string-equal (file-remote-p filename 'user) "root") |
| 2867 (set (make-local-variable 'backup-by-copying-when-mismatch) t) | 2867 (set (make-local-variable 'backup-by-copying-when-mismatch) t))) |
| 2868 (put 'backup-by-copying-when-mismatch 'permanent-local t))) | |
| 2869 (when (and (stringp local-copy) | 2868 (when (and (stringp local-copy) |
| 2870 (or remote-copy (null tramp-temp-buffer-file-name))) | 2869 (or remote-copy (null tramp-temp-buffer-file-name))) |
| 2871 (delete-file local-copy)) | 2870 (delete-file local-copy)) |
| 2872 (when (stringp remote-copy) | 2871 (when (stringp remote-copy) |
| 2873 (delete-file | 2872 (delete-file |