diff --git a/core/autoload/files.el b/core/autoload/files.el index 727b95db3..3e22607e7 100644 --- a/core/autoload/files.el +++ b/core/autoload/files.el @@ -108,26 +108,26 @@ be relative to it. The search recurses up to DEPTH and no further. DEPTH is an integer. MATCH is a string regexp. Only entries that match it will be included." - (let (file-name-handler-alist - result) + (let (result file-name-handler-alist) (dolist (file (mapcan (doom-rpartial #'doom-glob "*") (doom-enlist paths))) (cond ((file-directory-p file) - (nconcq! result - (and (memq type '(t dirs)) - (string-match-p match file) - (not (and filter (funcall filter file))) - (not (and (file-symlink-p file) - (not follow-symlinks))) - (<= mindepth 0) - (list (cond (map (funcall map file)) - (relative-to (file-relative-name file relative-to)) - (file)))) - (and (>= depth 1) - (apply #'doom-files-in file - (append (list :mindepth (1- mindepth) - :depth (1- depth) - :relative-to relative-to) - rest))))) + (appendq! + result + (and (memq type '(t dirs)) + (string-match-p match file) + (not (and filter (funcall filter file))) + (not (and (file-symlink-p file) + (not follow-symlinks))) + (<= mindepth 0) + (list (cond (map (funcall map file)) + (relative-to (file-relative-name file relative-to)) + (file)))) + (and (>= depth 1) + (apply #'doom-files-in file + (append (list :mindepth (1- mindepth) + :depth (1- depth) + :relative-to relative-to) + rest))))) ((and (memq type '(t files)) (string-match-p match file) (not (and filter (funcall filter file))) diff --git a/core/core-lib.el b/core/core-lib.el index a19726173..819f5f99b 100644 --- a/core/core-lib.el +++ b/core/core-lib.el @@ -159,10 +159,6 @@ This is a variadic `cl-pushnew'." "Append LISTS to SYM in place." `(setq ,sym (append ,sym ,@lists))) -(defmacro nconcq! (sym &rest lists) - "Append LISTS to SYM by altering them in place." - `(setq ,sym (nconc ,sym ,@lists))) - (defmacro delq! (elt list &optional fetcher) "`delq' ELT from LIST in-place.