jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify tags-all/tags-local too + Fix formatting

Browse source
This commit is contained in:
Cyrille Froehlich 2021-07-28 08:31:29 +09:00
parent 99a2285317
commit bbeee64f41
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
org-ql.el
View file

@ -1743,14 +1743,15 @@ Tests both inherited and local tags."
"Return non-nil if current heading has all of TAGS (a list of strings). "Return non-nil if current heading has all of TAGS (a list of strings).
Tests both inherited and local tags." Tests both inherited and local tags."
;; MAYBE: -all versions for inherited and local. ;; MAYBE: -all versions for inherited and local.
:normalizers ((`(,predicate-names) `(tags)) :normalizers ((`(,predicate-names . ,tags)
(`(,predicate-names . ,tags) `(and ,@(--map `(tags ,it) tags)))) `(and ,@(--map `(tags ,it) tags))))
:body (apply #'org-ql--predicate-tags tags)) :body (apply #'org-ql--predicate-tags tags))
(org-ql-defpred (tags-inherited inherited-tags tags-i itags) (&rest tags) (org-ql-defpred (tags-inherited inherited-tags tags-i itags) (&rest tags)
"Return non-nil if current heading's inherited tags include one or more of TAGS (a list of strings). "Return non-nil if current heading's inherited tags include one or more of TAGS (a list of strings).
If TAGS is nil, return non-nil if heading has any inherited tags." If TAGS is nil, return non-nil if heading has any inherited tags."
:normalizers ((`(,predicate-names . ,tags) `(tags-inherited ,@tags))) :normalizers ((`(,predicate-names . ,tags)
`(tags-inherited ,@tags)))
:body (cl-macrolet ((tags-p (tags) :body (cl-macrolet ((tags-p (tags)
`(and ,tags `(and ,tags
(not (eq 'org-ql-nil ,tags))))) (not (eq 'org-ql-nil ,tags)))))
@ -1763,8 +1764,8 @@ If TAGS is nil, return non-nil if heading has any inherited tags."
(org-ql-defpred (tags-local local-tags tags-l ltags) (&rest tags) (org-ql-defpred (tags-local local-tags tags-l ltags) (&rest tags)
"Return non-nil if current heading's local tags include one or more of TAGS (a list of strings). "Return non-nil if current heading's local tags include one or more of TAGS (a list of strings).
If TAGS is nil, return non-nil if heading has any local tags." If TAGS is nil, return non-nil if heading has any local tags."
:normalizers ((`(,predicate-names) `(tags-local)) :normalizers ((`(,predicate-names . ,tags)
(`(,predicate-names . ,tags) `(tags-local ,@tags))) `(tags-local ,@tags)))
:preambles ((`(,predicate-names . ,(and tags (guard tags))) :preambles ((`(,predicate-names . ,(and tags (guard tags)))
;; When searching for local, non-inherited tags, we can ;; When searching for local, non-inherited tags, we can
;; search directly to headings containing one of the tags. ;; search directly to headings containing one of the tags.