Mercurial > emacs
changeset 108338:370b10d642d7
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 19 Apr 2010 03:41:21 +0000 |
| parents | d5fae6429937 (current diff) 2604d177b630 (diff) |
| children | e88fb053fc02 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Apr 18 23:26:57 2010 +0000 +++ b/src/ChangeLog Mon Apr 19 03:41:21 2010 +0000 @@ -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
--- a/src/dired.c Sun Apr 18 23:26:57 2010 +0000 +++ b/src/dired.c Mon Apr 19 03:41:21 2010 +0000 @@ -939,9 +939,9 @@ 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.