diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-06-02 10:25:50 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-06-02 10:25:50 -0700 |
| commit | 42a851c6347bb45a2fb8acdb0d2a1ca468ecefd3 (patch) | |
| tree | bfd595460df8864956639fecc13636a94d413212 /doc/lispref | |
| parent | 4a7e74fea687011ee81dcbb02294bccd99b3a05f (diff) | |
| parent | ca3f0a8343c125a44845d21808ab0e35b87533db (diff) | |
| download | emacs-42a851c6347bb45a2fb8acdb0d2a1ca468ecefd3.tar.gz emacs-42a851c6347bb45a2fb8acdb0d2a1ca468ecefd3.tar.bz2 emacs-42a851c6347bb45a2fb8acdb0d2a1ca468ecefd3.zip | |
Merge from origin/emacs-26
ca3f0a8 ; * etc/NEWS: Belated announcement of 2 changes made in Emacs...
99f92da Improve documentation of 'directory-files-and-attributes'
df8649a * lisp/gnus/message.el (message-remove-header): Don't remove ...
b682a7e ; * etc/NEWS: Add headings for Emacs 26.2
aa175a4 Adapt hexl-mode to native line-number display
b8e7749 Fix example in Tramp manual
f212fe5 Handle case where Xft is found but not XRender
186280f * doc/misc/tramp.texi (Frequently Asked Questions): Adapt zsh...
24ba633 Improve read-multiple-choice docstring (Bug#31628)
Conflicts:
etc/NEWS
src/dired.c
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/files.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 71402cd836f..e36fdbe95bf 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -2915,8 +2915,8 @@ are included. This is similar to @code{directory-files} in deciding which files to report on and how to report their names. However, instead of returning a list of file names, it returns for each file a -list @code{(@var{filename} . @var{attributes})}, where @var{attributes} -is what @code{file-attributes} would return for that file. +list @code{(@var{filename} @var{attributes})}, where @var{attributes} +is what @code{file-attributes} returns for that file. The optional argument @var{id-format} has the same meaning as the corresponding argument to @code{file-attributes} (@pxref{Definition of file-attributes}). |