diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-04-19 03:41:21 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-04-19 03:41:21 +0000 |
| commit | d1e5eaeffcf5ba66d66d12f305d7ab5289e09471 (patch) | |
| tree | 4e3a3d5c16970b1aeb8bb09ab03268f1ce45d4da | |
| parent | cce5cf50c5ed75d7ab068b5787a719e6da288928 (diff) | |
| parent | 844bed0d1c3bb9466baffa9c4e8ed2b1196cb939 (diff) | |
| download | emacs-d1e5eaeffcf5ba66d66d12f305d7ab5289e09471.tar.gz | |
Merge from mainline.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/dired.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1adb81c1aea..f03bfd66159 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-04-19 Juanma Barranquero <lekktu@gmail.com> + + * dired.c (Ffile_attributes): Fix typo in docstring. + 2010-04-13 Adrian Robert <Adrian.B.Robert@gmail.com> * nsmenu.m (EmacsDialog-runDialogAt:): Declare ret as diff --git a/src/dired.c b/src/dired.c index 951969be0a4..d4b0ff20db2 100644 --- a/src/dired.c +++ b/src/dired.c @@ -939,9 +939,9 @@ DEFUN ("file-attributes", Ffile_attributes, Sfile_attributes, 1, 2, 0, Value is nil if specified file cannot be opened. ID-FORMAT specifies the preferred format of attributes uid and gid (see -below) - valid values are 'string and 'integer. The latter is the default, -but we plan to change that, so you should specify a non-nil value for -ID-FORMAT if you use the returned uid or gid. +below) - valid values are 'string and 'integer. The latter is the +default, but we plan to change that, so you should specify a non-nil value +for ID-FORMAT if you use the returned uid or gid. Elements of the attribute list are: 0. t for directory, string (name linked to) for symbolic link, or nil. |