Mercurial > emacs
diff lisp/files.el @ 83296:effe22690419
Merged from miles@gnu.org--gnu-2005 (patch 281-285)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-281
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-282
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-283
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-284
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-285
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-336
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 02 May 2005 14:38:00 +0000 |
| parents | ad07ff6e4555 beaf4d3d5cbf |
| children | b151ec53c504 |
line wrap: on
line diff
--- a/lisp/files.el Tue Apr 26 12:17:42 2005 +0000 +++ b/lisp/files.el Mon May 02 14:38:00 2005 +0000 @@ -2761,14 +2761,12 @@ (condition-case nil (delete-file to-name) (file-error nil)) - (write-region "" nil to-name nil 'silent nil 'excl) + (copy-file from-name to-name t t 'excl) nil) (file-already-exists t)) - ;; the file was somehow created by someone else between - ;; `make-temp-name' and `write-region', let's try again. - nil) -; (copy-file from-name to-name t t 'excl)) - (copy-file from-name to-name t t)) + ;; The file was somehow created by someone else between + ;; `delete-file' and `copy-file', so let's try again. + nil)) ;; Reset the umask. (set-default-file-modes umask))) (and modes