From 8ecc4c436544c21c334ac70cc1556e3f12f15a86 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Jan 2018 09:48:01 +0100 Subject: [PATCH] Move `org-match-any-p' in "org-macs.el" * lisp/org-macs.el (org-match-any-p): Moved from "org.el". * lisp/org.el (org-match-any-p): Removed. --- lisp/org-macs.el | 4 ++++ lisp/org.el | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 918c3a9ca..afecd0819 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -592,6 +592,10 @@ ones and overrule settings in the other lists." (beginning-of-line) (looking-at regexp))) +(defun org-match-any-p (re list) + "Non nil if regexp RE matches an element in LIST." + (cl-some (lambda (x) (string-match-p re x)) list)) + (defun org-in-regexp (regexp &optional nlines visually) "Check if point is inside a match of REGEXP. diff --git a/lisp/org.el b/lisp/org.el index cf8073fc2..1f66c1f0e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -14074,11 +14074,6 @@ epoch to the beginning of today (00:00)." ("m" . 2678400.0) ("y" . 31557600.0))))))) (t (org-2ft s))))) -(defun org-match-any-p (re list) - "Does re match any element of list?" - (setq list (mapcar (lambda (x) (string-match re x)) list)) - (delq nil list)) - (defvar org-add-colon-after-tag-completion nil) ;; dynamically scoped param (defvar org-tags-overlay (make-overlay 1 1)) (delete-overlay org-tags-overlay)