Merge branch 'maint'

2020-01-20 16:58:00 +01:00 · 2020-01-20 16:58:00 +01:00 · dc1d4aa12e
parent 7cf58a55da 06cf532f47
commit dc1d4aa12e
1 changed files with 1 additions and 1 deletions
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@ -7927,7 +7927,7 @@ tags in the FILTER if any of the tags in FILTER are grouptags."
 		     filter)))
      (dolist (x filter)
 	(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)
  "Return a form associated to tag-expression TAGS.