* lisp/files.el (file-expand-wildcards): Fix sorting of subdirs

E.g. (file-expand-wildcards "/u*/*m*")
returned ("/usr/games" "/u/dummy" "/u/monnier" "/u/omnibook-disk")
instead of ("/u/dummy" "/u/monnier" "/u/omnibook-disk" "/usr/games").

(cherry picked from commit 1da0fccc646d1921782dd6d701bc86004cfb3732)

diff --git a/lisp/files.el b/lisp/files.el
index 21f3376016c7f0f14d60decf0a14ba3b39ac8f43..839683ecae1ebc21cde3e121857c7e893313dacb 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7547,12 +7547,12 @@ default directory.  However, if FULL is non-nil, they are absolute."
           ;; if DIRPART contains wildcards.
           (dirs (if (and dirpart
                          (string-match "[[*?]" (file-local-name dirpart)))
-                    (mapcar 'file-name-as-directory
+                    (mapcar #'file-name-as-directory
                             (file-expand-wildcards
                               (directory-file-name dirpart) nil regexp))
                   (list dirpart)))
           contents)
-      (dolist (dir dirs)
+      (dolist (dir (nreverse dirs))
        (when (or (null dir)    ; Possible if DIRPART is not wild.
                  (file-accessible-directory-p dir))
          (let ((this-dir-contents