summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-01-23 09:48:01 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-01-23 09:48:01 +0100
commit8ecc4c436544c21c334ac70cc1556e3f12f15a86 (patch)
tree0674cc75e3644485558ba1b235676dddd7a3cfaf
parent66bbe54a75fb84ac65af24422b1ac13620c0890c (diff)
downloadorg-mode-8ecc4c436544c21c334ac70cc1556e3f12f15a86.tar.gz
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.
-rw-r--r--lisp/org-macs.el4
-rw-r--r--lisp/org.el5
2 files changed, 4 insertions, 5 deletions
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 918c3a9..afecd08 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 cf8073f..1f66c1f 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)