procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Speed up directory-files-recursively

Browse source 
* files.el (directory-files-recursively): Use
`file-name-all-completions' instead of `directory-files' for
greater speed.
This commit is contained in:
Lars Magne Ingebrigtsen 2014-12-10 05:38:23 +01:00
parent ef8892db3c
commit c9e3deffab
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,5 +1,9 @@
2014-12-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
* files.el (directory-files-recursively): Use
`file-name-all-completions' instead of `directory-files' for
greater speed.
* net/shr.el (shr-tag-object): Don't bug out on text elements in
<object>.

27
lisp/files.el
View file

@ -769,18 +769,21 @@ and alphabetical order.
If INCLUDE-DIRECTORIES, also include directories that have matching names."
(let ((result nil)
(files nil))
(dolist (file (directory-files dir t))
(let ((leaf (file-name-nondirectory file)))
(unless (member leaf '("." ".."))
(if (file-directory-p file)
(progn
(when (and include-directories
(string-match match leaf))
(push file files))
(setq result (nconc result (directory-files-recursively
file match include-directories))))
(when (string-match match leaf)
(push file files))))))
(dolist (file (sort (file-name-all-completions "" dir)
'string<))
(unless (member file '("./" "../"))
(if (= (aref file (1- (length file))) ?/)
(progn
(setq result (nconc result (directory-files-recursively
(expand-file-name file dir)
match include-directories)))
(when (and include-directories
(string-match match
(substring file 0 (1- (length file)))))
(setq result (nconc result (list
(expand-file-name file dir))))))
(when (string-match match file)
(push (expand-file-name file dir) files)))))
(nconc result (nreverse files))))
(defun load-file (file)