>From 1e00b856ca423bb7e4491b9999cd3de80223d0bd Mon Sep 17 00:00:00 2001 From: Xi Lu Date: Sat, 7 Jan 2023 22:46:40 +0800 Subject: [PATCH] Replace `hfy-find-cmd' with `directory-files-recursively'. --- lisp/htmlfontify.el | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index c989a12d205..0746b5e3a36 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -372,11 +372,14 @@ hfy-istext-command :tag "istext-command" :type '(string)) -(defcustom hfy-find-cmd - "find . -type f \\! -name \\*~ \\! -name \\*.flc \\! -path \\*/CVS/\\*" - "Find command used to harvest a list of files to attempt to fontify." - :tag "find-command" - :type '(string)) +(defcustom hfy-exclude-file-rules + '("\\.flc$" + "/CVS/.*" + ".*~" + "\\.git/.*") + "Define some regular expressions to exclude files" + :tag "exclude-rules" + :type '(list string)) (defcustom hfy-display-class nil "Display class to use to determine which display class to use when @@ -1823,11 +1826,12 @@ htmlfontify-buffer (defun hfy-list-files (directory) "Return a list of files under DIRECTORY. Strips any leading \"./\" from each filename." - ;;(message "hfy-list-files");;DBUG + ;;(message "hfy-list-files");;DEBUG ;; FIXME: this changes the dir of the current buffer. Is that right?? (cd directory) - (mapcar (lambda (F) (if (string-match "^./\\(.*\\)" F) (match-string 1 F) F)) - (split-string (shell-command-to-string hfy-find-cmd))) ) + (remove-if (lambda (f) (seq-some (lambda (r) + (string-match r f)) hfy-exclude-file-rules)) + (directory-files-recursively "." ".*"))) ;; strip the filename off, return a directory name ;; not a particularly thorough implementation, but it will be -- 2.39.0