Merge branch 'maint'
This commit is contained in:
commit
dc1d4aa12e
|
@ -7927,7 +7927,7 @@ tags in the FILTER if any of the tags in FILTER are grouptags."
|
||||||
filter)))
|
filter)))
|
||||||
(dolist (x filter)
|
(dolist (x filter)
|
||||||
(push (org-agenda-filter-effort-form x) f))))
|
(push (org-agenda-filter-effort-form x) f))))
|
||||||
(cons 'and (nreverse f))))
|
(cons (if (eq type 'category) 'or 'and) (nreverse f))))
|
||||||
|
|
||||||
(defun org-agenda-filter-make-matcher-tag-exp (tags op)
|
(defun org-agenda-filter-make-matcher-tag-exp (tags op)
|
||||||
"Return a form associated to tag-expression TAGS.
|
"Return a form associated to tag-expression TAGS.
|
||||||
|
|
Loading…
Reference in New Issue