From e8c77d9abda9c5c48de546a4ff667ffdf3d27c94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Sun, 15 Jan 2023 15:23:44 +0100 Subject: [PATCH] Fix hfy-exclude-file-rules (bug#60562) * lisp/htmlfontify.el (hfy-exclude-file-rules): Fix broken defcustom type; no longer fails test-custom-opts. Fix regexps not to use newline-sensitive patterns like `.` and `$` which do not make sense when matching file names. Better doc string. * lisp/htmlfontify.el (hfy-list-files): Simplify regexp argument. --- lisp/htmlfontify.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 0959405081f..1ab33cc6411 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -373,13 +373,13 @@ otherwise." :type '(string)) (defcustom hfy-exclude-file-rules - '("\\.flc$" - "/CVS/.*" - ".*~$" - "/\\.git\\(?:/.*\\)?$") - "Define some regular expressions to exclude files" + '("\\.flc\\'" + "/CVS/" + "~\\'" + "/\\.git\\(?:/\\|\\'\\)") + "Regular expressions matching files to exclude." :tag "exclude-rules" - :type '(list string) + :type '(repeat regexp) :version "29.1") (defcustom hfy-display-class nil @@ -1835,7 +1835,7 @@ Strips any leading \"./\" from each filename." (seq-some (lambda (r) (string-match r f)) hfy-exclude-file-rules))) - (directory-files-recursively "." ".*" nil t))) + (directory-files-recursively "." "" nil t))) ;; strip the filename off, return a directory name ;; not a particularly thorough implementation, but it will be -- 2.39.5