summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien <bzg@gnu.org>2020-01-20 16:58:00 +0100
committerBastien <bzg@gnu.org>2020-01-20 16:58:00 +0100
commitdc1d4aa12e67382dfc265a132450b51d2e7b2c73 (patch)
treeb6edab424b41e114a2c34f8ef175a8cba9390e0b
parent7cf58a55dad74e8c9935a49bd56dbd7a11c3946d (diff)
parent06cf532f475939a7a36b37b67429f130155e2349 (diff)
downloadorg-mode-dc1d4aa12e67382dfc265a132450b51d2e7b2c73.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index af3a972..9fe39c5 100644
--- 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.