emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix doom-files-in returning files in arbitrary order

Browse source 
This would cause compilation issues in doom//byte-compile because
prerequisite files weren't compiled before dependent ones.
This commit is contained in:
Henrik Lissner 2018-05-30 01:43:56 +02:00
parent 75e6ea6bee
commit 6b1e1a2c58
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/core-lib.el
View file

@ -105,6 +105,7 @@ This is used by `associate!', `file-exists-p!' and `project-file-exists-p!'."
filter filter
map map
full full
nosort
(follow-symlinks t) (follow-symlinks t)
(type 'files) (type 'files)
(relative-to (unless full default-directory)) (relative-to (unless full default-directory))
@ -137,10 +138,10 @@ MATCH is a string regexp. Only entries that match it will be included."
nconc (apply #'doom-files-in path (plist-put rest :relative-to relative-to)))) nconc (apply #'doom-files-in path (plist-put rest :relative-to relative-to))))
((let ((path path-or-paths) ((let ((path path-or-paths)
result) result)
(dolist (file (file-name-all-completions "" path)) (dolist (file (directory-files path nil "." nosort))
(unless (member file '("./" "../")) (unless (member file '("." ".."))
(let ((fullpath (expand-file-name file path))) (let ((fullpath (expand-file-name file path)))
(cond ((directory-name-p fullpath) (cond ((file-directory-p fullpath)
(when (and (memq type '(t dirs)) (when (and (memq type '(t dirs))
(string-match-p match file) (string-match-p match file)
(not (and filter (funcall filter fullpath))) (not (and filter (funcall filter fullpath)))