comparison 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
comparison
equal deleted inserted replaced
83295:2d137ca54960 83296:effe22690419
2759 (while (condition-case () 2759 (while (condition-case ()
2760 (progn 2760 (progn
2761 (condition-case nil 2761 (condition-case nil
2762 (delete-file to-name) 2762 (delete-file to-name)
2763 (file-error nil)) 2763 (file-error nil))
2764 (write-region "" nil to-name nil 'silent nil 'excl) 2764 (copy-file from-name to-name t t 'excl)
2765 nil) 2765 nil)
2766 (file-already-exists t)) 2766 (file-already-exists t))
2767 ;; the file was somehow created by someone else between 2767 ;; The file was somehow created by someone else between
2768 ;; `make-temp-name' and `write-region', let's try again. 2768 ;; `delete-file' and `copy-file', so let's try again.
2769 nil) 2769 nil))
2770 ; (copy-file from-name to-name t t 'excl))
2771 (copy-file from-name to-name t t))
2772 ;; Reset the umask. 2770 ;; Reset the umask.
2773 (set-default-file-modes umask))) 2771 (set-default-file-modes umask)))
2774 (and modes 2772 (and modes
2775 (set-file-modes to-name (logand modes #o1777)))) 2773 (set-file-modes to-name (logand modes #o1777))))
2776 2774