[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] scratch/org-contacts-rebased ee973b2 087/118: Deprecate `org-find

From: Stefan Monnier
Subject: [elpa] scratch/org-contacts-rebased ee973b2 087/118: Deprecate `org-find-if' in favor of `cl-find-if'
Date: Fri, 12 Nov 2021 15:37:09 -0500 (EST)

branch: scratch/org-contacts-rebased
commit ee973b262e177eb47be9e80f2918b72d36c85847
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Deprecate `org-find-if' in favor of `cl-find-if'
    * lisp/org.el (org-find-if): Remove function.
    * contrib/lisp/org-contacts.el (org-contacts-db-need-update-p):
    (org-contacts-remove-ignored-property-values): Use `cl-find-if'
    * lisp/org-compat.el (org-find-if): Mark function as an obsolete alias
      for `cl-find-if'.
 org-contacts.el | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/org-contacts.el b/org-contacts.el
index 13fbf27..797aa29 100644
--- a/org-contacts.el
+++ b/org-contacts.el
@@ -232,7 +232,7 @@ A regexp matching strings of whitespace, `,' and `;'.")
 (defun org-contacts-db-need-update-p ()
   "Determine whether `org-contacts-db' needs to be refreshed."
   (or (null org-contacts-last-update)
-      (org-find-if (lambda (file)
+      (cl-find-if (lambda (file)
                     (or (time-less-p org-contacts-last-update
                                      (elt (file-attributes file) 5))))
@@ -320,12 +320,12 @@ cell corresponding to the contact properties.
                      (org-string-match-p name-match
                                          (first contact)))
                 (and prop-match
-                     (org-find-if (lambda (prop)
+                     (cl-find-if (lambda (prop)
                                     (and (string= (car prop-match) (car prop))
                                          (org-string-match-p (cdr prop-match) 
(cdr prop))))
                                   (caddr contact)))
                 (and tags-match
-                     (org-find-if (lambda (tag)
+                     (cl-find-if (lambda (tag)
                                     (org-string-match-p tags-match tag))
                                    (or (cdr (assoc-string "ALLTAGS" (caddr 
contact))) "") ":"))))
@@ -487,13 +487,10 @@ prefixes rather than just the beginning of the string."
 (defun org-contacts-test-completion-prefix (string collection predicate)
-  ;; Prevents `org-find-if' from redefining `predicate' and going into
-  ;; an infinite loop.
-  (lexical-let ((predicate predicate))
-    (org-find-if (lambda (el)
-                  (and (or (null predicate) (funcall predicate el))
-                       (string= string el)))
-                collection)))
+  (cl-find-if (lambda (el)
+               (and (or (null predicate) (funcall predicate el))
+                    (string= string el)))
+             collection))
 (defun org-contacts-boundaries-prefix (string collection predicate suffix)
   (list* 'boundaries (completion-boundaries string collection predicate 
@@ -592,7 +589,7 @@ description."
   "Remove all ignore-list's elements from list and you can use
    regular expressions in the ignore list."
   (cl-remove-if (lambda (el)
-                 (org-find-if (lambda (x)
+                 (cl-find-if (lambda (x)
                                 (string-match-p x el))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]