summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/dired.c6
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.