diff src/fileio.c @ 83241:3dcba0bc766b

Merged in changes from CVS trunk. (Long time no see!) :-) Patches applied: * [e-mail]--gnu-2004/gnus--rel--5.10--patch-83 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-84 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-1 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-2 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-3 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-4 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-5 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-6 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-7 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-8 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-9 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-10 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-11 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-12 Remove "-face" suffix from lazy-highlight face name * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-13 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-14 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-15 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-16 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-17 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-18 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-19 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-20 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-21 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-22 <no summary provided> * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-23 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-24 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-25 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-26 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-27 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-28 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-29 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-30 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-31 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-32 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-33 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-34 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-35 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-36 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-37 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-38 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-39 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-40 Fix regressions from latest reftex update * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-41 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-42 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-43 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-44 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-45 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-46 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-47 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-48 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-49 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-50 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-51 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-52 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-53 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-54 Update from CVS: lisp/cus-start.el (all): Add `undo-outer-limit'. * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-55 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-56 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-57 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-58 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-59 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-60 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-61 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-62 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-63 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-64 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-65 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-66 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-67 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-68 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-69 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-70 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-71 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-72 src/dispextern.h (xassert): Enable unconditionally. * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-73 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-74 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-75 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--base-0 tag of [e-mail]--gnu-2004/gnus--rel--5.10--patch-82 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-1 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-2 Merge from [e-mail]--gnu-2004 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-3 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-4 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-5 Update from CVS: exi/gnus-faq.texi ([4.1]): Typo. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-6 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-7 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-8 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-9 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-10 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-11 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-281

--- a/src/fileio.c	Thu Feb 03 22:58:27 2005 +0000
+++ b/src/fileio.c	Thu Feb 03 23:28:36 2005 +0000
@@ -2392,10 +2392,10 @@
 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil.
 A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
-Fourth arg KEEP-TIME non-nil means give the new file the same
+Always sets the file modes of the output file to match the input file.
+Fourth arg KEEP-TIME non-nil means give the output file the same
 last-modified time as the old one.  (This works on only some systems.)
-A prefix arg makes KEEP-TIME non-nil.
-Also set the file modes of the target file to match the source file.  */)
+A prefix arg makes KEEP-TIME non-nil.  */)
      (file, newname, ok_if_already_exists, keep_time)
      Lisp_Object file, newname, ok_if_already_exists, keep_time;
 {