diff options
| author | Stefan Monnier | 2013-01-03 21:42:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2013-01-03 21:42:08 -0500 |
| commit | 553081a514e463013c1603ecff64cf7cb0473767 (patch) | |
| tree | 239a3f74707bdfcecdcd396cca1ad1a99d8d43c0 | |
| parent | ee0d39381afabe6ca81701e786fa506239e261d2 (diff) | |
| download | emacs-553081a514e463013c1603ecff64cf7cb0473767.tar.gz emacs-553081a514e463013c1603ecff64cf7cb0473767.zip | |
* src/fileio.c (Ffile_acl): Undocument return format.
* doc/lispref/files.texi (File Attributes): Idem.
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/files.texi | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 8 |
4 files changed, 13 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 4815ac2a482..f9f3aad9ab2 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-01-04 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * files.texi (File Attributes): Undocument return format of file-acl. | ||
| 4 | |||
| 1 | 2013-01-03 Glenn Morris <rgm@gnu.org> | 5 | 2013-01-03 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * processes.texi (System Processes): | 7 | * processes.texi (System Processes): |
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index c323a6e72ad..114eb1f38ea 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -1363,7 +1363,7 @@ security APIs. | |||
| 1363 | 1363 | ||
| 1364 | @defun file-acl filename | 1364 | @defun file-acl filename |
| 1365 | This function returns the ACL entries of the file @var{filename}. The | 1365 | This function returns the ACL entries of the file @var{filename}. The |
| 1366 | return value is a platform-dependent string containing the textual | 1366 | return value is a platform-dependent object containing some |
| 1367 | representation of the ACL entries. Don't use it for anything except | 1367 | representation of the ACL entries. Don't use it for anything except |
| 1368 | passing it to the @code{set-file-acl} function (@pxref{Changing Files, | 1368 | passing it to the @code{set-file-acl} function (@pxref{Changing Files, |
| 1369 | set-file-acl}). | 1369 | set-file-acl}). |
diff --git a/src/ChangeLog b/src/ChangeLog index 7342f7c6add..fa27e299ad7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-01-04 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * fileio.c (Ffile_acl): Undocument return format. | ||
| 4 | |||
| 1 | 2013-01-02 Glenn Morris <rgm@gnu.org> | 5 | 2013-01-02 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * keymap.c (Fkey_description): Doc fix. (Bug#13323) | 7 | * keymap.c (Fkey_description): Doc fix. (Bug#13323) |
diff --git a/src/fileio.c b/src/fileio.c index 05f615f0c88..5e9b36ee44a 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3084,11 +3084,11 @@ or if Emacs was not compiled with SELinux support. */) | |||
| 3084 | } | 3084 | } |
| 3085 | 3085 | ||
| 3086 | DEFUN ("file-acl", Ffile_acl, Sfile_acl, 1, 1, 0, | 3086 | DEFUN ("file-acl", Ffile_acl, Sfile_acl, 1, 1, 0, |
| 3087 | doc: /* Return ACL entries of file named FILENAME, as a string. | 3087 | doc: /* Return ACL entries of file named FILENAME. |
| 3088 | The entries are returned in a format suitable for use in `set-file-acl' | ||
| 3089 | but is otherwise undocumented and subject to change. | ||
| 3088 | Return nil if file does not exist or is not accessible, or if Emacs | 3090 | Return nil if file does not exist or is not accessible, or if Emacs |
| 3089 | was unable to determine the ACL entries. The latter can happen for | 3091 | was unable to determine the ACL entries. */) |
| 3090 | local files if Emacs was not compiled with ACL support, or for remote | ||
| 3091 | files if the file handler returns nil for the file's ACL entries. */) | ||
| 3092 | (Lisp_Object filename) | 3092 | (Lisp_Object filename) |
| 3093 | { | 3093 | { |
| 3094 | Lisp_Object absname; | 3094 | Lisp_Object absname; |