aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-12-23 16:50:31 +0800
committerXue Fuqiao2013-12-23 16:50:31 +0800
commit882b0b86e634c7677ee2829c607affe7385c758a (patch)
treeddd9b3e1f0e25ce9df49921a38bfbe79cb31bd99
parentc2d736b4e7298207c7a26f2cb371117f802dcd3e (diff)
downloademacs-882b0b86e634c7677ee2829c607affe7385c758a.tar.gz
emacs-882b0b86e634c7677ee2829c607affe7385c758a.zip
Fix an argument of `copy-file'.
* doc/lispref/files.texi (Changing Files): Fix an argument of `copy-file'.
-rw-r--r--doc/lispref/ChangeLog2
-rw-r--r--doc/lispref/files.texi2
-rw-r--r--etc/NEWS3
3 files changed, 6 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c598cf0f5aa..6fd0f6a271b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,7 @@
12013-12-23 Xue Fuqiao <xfq.free@gmail.com> 12013-12-23 Xue Fuqiao <xfq.free@gmail.com>
2 2
3 * files.texi (Changing Files): Fix an argument of `copy-file'.
4
3 * strings.texi (Creating Strings): Document TRIM in `split-string'. 5 * strings.texi (Creating Strings): Document TRIM in `split-string'.
4 6
52013-12-23 Chong Yidong <cyd@gnu.org> 72013-12-23 Chong Yidong <cyd@gnu.org>
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 944a1e37cc4..c1eae5eefa3 100644
--- 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
1550same effect as renaming, aside from momentary intermediate states. 1550same effect as renaming, aside from momentary intermediate states.
1551@end deffn 1551@end deffn
1552 1552
1553@deffn Command copy-file oldname newname &optional ok-if-exists time preserve-uid-gid preserve-selinux 1553@deffn Command copy-file oldname newname &optional ok-if-exists time preserve-uid-gid preserve-extended-attributes
1554This command copies the file @var{oldname} to @var{newname}. An 1554This command copies the file @var{oldname} to @var{newname}. An
1555error is signaled if @var{oldname} does not exist. If @var{newname} 1555error is signaled if @var{oldname} does not exist. If @var{newname}
1556names a directory, it copies @var{oldname} into that directory, 1556names a directory, it copies @var{oldname} into that directory,
diff --git a/etc/NEWS b/etc/NEWS
index a638a613ae2..3e56b49bfe5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -993,6 +993,7 @@ the start and end of each substring.
993 993
994** File-handling changes 994** File-handling changes
995 995
996+++
996*** Support for filesystem notifications. 997*** Support for filesystem notifications.
997Emacs now supports notifications of filesystem changes, such as 998Emacs now supports notifications of filesystem changes, such as
998creation, modification, and deletion of files. This requires the 999creation, modification, and deletion of files. This requires the
@@ -1000,11 +1001,13 @@ creation, modification, and deletion of files. This requires the
1000MS-Windows systems, this is supported for Windows XP and newer 1001MS-Windows systems, this is supported for Windows XP and newer
1001versions. 1002versions.
1002 1003
1004+++
1003*** The 9th element returned by `file-attributes' is now unspecified. 1005*** The 9th element returned by `file-attributes' is now unspecified.
1004Formerly, it was t if the file's gid would change if file were deleted 1006Formerly, it was t if the file's gid would change if file were deleted
1005and recreated. This value has been inaccurate for years on many 1007and recreated. This value has been inaccurate for years on many
1006platforms, and nobody seems to have noticed or cared. 1008platforms, and nobody seems to have noticed or cared.
1007 1009
1010+++
1008*** The 6th argument to `copy-file' has been renamed to 1011*** The 6th argument to `copy-file' has been renamed to
1009PRESERVE-EXTENDED-ATTRIBUTES as it now handles both SELinux context 1012PRESERVE-EXTENDED-ATTRIBUTES as it now handles both SELinux context
1010and ACL entries. 1013and ACL entries.