Fix an argument of `copy-file'.

* doc/lispref/files.texi (Changing Files): Fix an argument of `copy-file'.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c598cf0f5aa5e25efb7d9e08dc10d3ffd2fc5c50..6fd0f6a271b99c773411a4858be9b81731fa613d 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,7 @@
 2013-12-23  Xue Fuqiao  <xfq.free@gmail.com>
 
+       * files.texi (Changing Files): Fix an argument of `copy-file'.
+
        * strings.texi (Creating Strings): Document TRIM in `split-string'.
 
 2013-12-23  Chong Yidong  <cyd@gnu.org>

diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 944a1e37cc4c4f88aea6e3257325994f45cf85c9..c1eae5eefa3e9779d6d83952884dbf2c367fa6ee 100644 (file)
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1550,7 +1550,7 @@ with @code{add-name-to-file} and then deleting @var{filename} has the
 same effect as renaming, aside from momentary intermediate states.
 @end deffn
 
-@deffn Command copy-file oldname newname &optional ok-if-exists time preserve-uid-gid preserve-selinux
+@deffn Command copy-file oldname newname &optional ok-if-exists time preserve-uid-gid preserve-extended-attributes
 This command copies the file @var{oldname} to @var{newname}.  An
 error is signaled if @var{oldname} does not exist.  If @var{newname}
 names a directory, it copies @var{oldname} into that directory,

diff --git a/etc/NEWS b/etc/NEWS
index a638a613ae283c737d08b9110e1ec5ca5b1b504f..3e56b49bfe5f25057ef064a07d19aae956d96ea2 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -993,6 +993,7 @@ the start and end of each substring.
 
 ** File-handling changes
 
++++
 *** Support for filesystem notifications.
 Emacs now supports notifications of filesystem changes, such as
 creation, modification, and deletion of files.  This requires the
@@ -1000,11 +1001,13 @@ creation, modification, and deletion of files.  This requires the
 MS-Windows systems, this is supported for Windows XP and newer
 versions.
 
++++
 *** The 9th element returned by `file-attributes' is now unspecified.
 Formerly, it was t if the file's gid would change if file were deleted
 and recreated.  This value has been inaccurate for years on many
 platforms, and nobody seems to have noticed or cared.
 
++++
 *** The 6th argument to `copy-file' has been renamed to
 PRESERVE-EXTENDED-ATTRIBUTES as it now handles both SELinux context
 and ACL entries.