From: Stefan Kangas Date: Tue, 9 Aug 2022 22:21:31 +0000 (+0200) Subject: Make filesets-filter-list obsolete in favor of seq-filter X-Git-Tag: emacs-29.0.90~1447^2~263 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cbc925bbed8f59135039e0055b5eadcead14ee29;p=emacs.git Make filesets-filter-list obsolete in favor of seq-filter * lisp/filesets.el (filesets-filter-list): Make obsolete in favor of 'seq-filter'. Update callers. --- diff --git a/lisp/filesets.el b/lisp/filesets.el index e1d1379551f..83e7fa3c9a6 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -146,18 +146,11 @@ is loaded before user customizations. Thus, if (require \\='filesets) precedes the `custom-set-variables' command or, for XEmacs, if init.el is loaded before custom.el, set this variable to t.") - -;;; utils (defun filesets-filter-list (lst cond-fn) "Remove all elements not conforming to COND-FN from list LST. COND-FN takes one argument: the current element." -; (cl-remove 'dummy lst :test (lambda (dummy elt) -; (not (funcall cond-fn elt))))) - (let ((rv nil)) - (dolist (elt lst) - (when (funcall cond-fn elt) - (push elt rv))) - (nreverse rv))) + (declare (obsolete seq-filter "29.1")) + (seq-filter cond-fn lst)) (defun filesets-ormap (fsom-pred lst) "Return the tail of LST for the head of which FSOM-PRED is non-nil." @@ -257,13 +250,13 @@ SYM to VAL and return t. If INIT-FLAG is non-nil, set with (setq filesets-menu-use-cached-flag nil) (when (default-boundp 'filesets-data) (let ((modified-filesets - (filesets-filter-list val - (lambda (x) - (let ((name (car x)) - (data (cdr x))) - (let ((elt (assoc name filesets-data))) - (or (not elt) - (not (equal data (cdr elt)))))))))) + (seq-filter (lambda (x) + (let ((name (car x)) + (data (cdr x))) + (let ((elt (assoc name filesets-data))) + (or (not elt) + (not (equal data (cdr elt))))))) + val))) (dolist (x modified-filesets) (filesets-reset-fileset (car x)))))) (filesets-set-default sym val)) @@ -1033,12 +1026,12 @@ defined in `filesets-ingroup-patterns'." (defun filesets-filter-dir-names (lst &optional negative) "Remove non-directory names from a list of strings. If NEGATIVE is non-nil, remove all directory names." - (filesets-filter-list lst - (lambda (x) - (and (not (string-match-p "^\\.+/$" x)) - (if negative - (not (string-match-p "[:/\\]$" x)) - (string-match-p "[:/\\]$" x)))))) + (seq-filter (lambda (x) + (and (not (string-match-p "^\\.+/$" x)) + (if negative + (not (string-match-p "[:/\\]$" x)) + (string-match-p "[:/\\]$" x)))) + lst)) (defun filesets-conditional-sort (lst &optional access-fn) "Return a sorted copy of LST, LST being a list of strings. @@ -1683,9 +1676,9 @@ Assume MODE (see `filesets-entry-mode'), if provided." (filesets-directory-files dir patt ':files t)) ;; (message "Filesets: malformed entry: %s" entry))))))) (error "Filesets: malformed entry: %s" entry))))))) - (filesets-filter-list fl - (lambda (file) - (not (filesets-filetype-property file event)))))) + (seq-filter (lambda (file) + (not (filesets-filetype-property file event))) + fl))) (defun filesets-files-under (level depth entry dir patt &optional relativep) "Files under DIR that match PATT.