aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/files.texi12
2 files changed, 13 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7893424a942..b2f89024726 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12012-12-29 Eli Zaretskii <eliz@gnu.org>
2
3 * files.texi (Changing Files): Document the return values of
4 set-file-selinux-context and set-file-acl.
5
12012-12-27 Glenn Morris <rgm@gnu.org> 62012-12-27 Glenn Morris <rgm@gnu.org>
2 7
3 * files.texi (File Names): Mention Cygwin conversion functions. 8 * files.texi (File Names): Mention Cygwin conversion functions.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 3faa5f5e257..4317fe42523 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1703,9 +1703,11 @@ This function sets the SELinux security context of the file
1703@var{filename} to @var{context}. @xref{File Attributes}, for a brief 1703@var{filename} to @var{context}. @xref{File Attributes}, for a brief
1704description of SELinux contexts. The @var{context} argument should be 1704description of SELinux contexts. The @var{context} argument should be
1705a list @code{(@var{user} @var{role} @var{type} @var{range})}, like the 1705a list @code{(@var{user} @var{role} @var{type} @var{range})}, like the
1706return value of @code{file-selinux-context}. The function does 1706return value of @code{file-selinux-context}. The function returns
1707nothing if SELinux is disabled, or if Emacs was compiled without 1707@code{t} if it succeeds to set the SELinux security context of
1708SELinux support. 1708@var{filename}, @code{nil} otherwise. The function does nothing and
1709returns @code{nil} if SELinux is disabled, or if Emacs was compiled
1710without SELinux support.
1709@end defun 1711@end defun
1710 1712
1711@defun set-file-acl filename acl-string 1713@defun set-file-acl filename acl-string
@@ -1713,7 +1715,9 @@ This function sets the ACL entries of the file @var{filename} to
1713@var{acl-string}. @xref{File Attributes}, for a brief description of 1715@var{acl-string}. @xref{File Attributes}, for a brief description of
1714ACLs. The @var{acl-string} argument should be a string containing the 1716ACLs. The @var{acl-string} argument should be a string containing the
1715textual representation of the desired ACL entries as returned by 1717textual representation of the desired ACL entries as returned by
1716@code{file-acl} (@pxref{File Attributes, file-acl}). 1718@code{file-acl} (@pxref{File Attributes, file-acl}). The function
1719returns @code{t} if it succeeds to set the ACL entries of
1720@var{filename}, @code{nil} otherwise.
1717@end defun 1721@end defun
1718 1722
1719@node File Names 1723@node File Names