From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 9 Dec 2023 23:42:36 +0000 (-0500)
Subject: * lisp/files.el (file-expand-wildcards): Fix sorting of subdirs
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b9d51d968f43b0228a4e8201f3fe696a2022a761;p=emacs.git

* 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 21f3376016c..839683ecae1 100644
--- 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