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

1 files changed, 5 insertions, 8 deletions

diff --git a/src/dired.c b/src/dired.c
index 115413dd6bc..a753b1930e6 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -358,17 +358,14 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
 DEFUN ("directory-files-and-attributes", Fdirectory_files_and_attributes,
        Sdirectory_files_and_attributes, 1, 5, 0,
        doc: /* Return a list of names of files and their attributes in DIRECTORY.
-The list returned has elements that contain the data from
-`file-attributes' for each file -- with the file name prepended.  So
-the structure of each element is
-`(FILE-NAME FILE-ATTRIBUTE1 FILE-ATTRIBUTE2 ...)'.
+Value is a list of the form:
 
-For instance, to get the size of the fourth element in a directory,
-you could say:
+  ((FILE1 FILE1-ATTRS) (FILE2 FILE2-ATTRS) ...)
 
-  (file-attribute-size (cdr (nth 3 (directory-files-and-attributes "/"))))
+where each FILEn-ATTRS is the attributes of FILEn as returned
+by `file-attributes'.
 
-There are four optional arguments:
+This function accepts four optional arguments:
 If FULL is non-nil, return absolute file names.  Otherwise return names
  that are relative to the specified directory.
 If MATCH is non-nil, mention only file names that match the regexp MATCH.