From 1690fbd88f4d55dc0e3c3af44f9fec534e75b601 Mon Sep 17 00:00:00 2001 From: Nick Dokos Date: Sun, 11 Jul 2021 23:51:44 -0400 Subject: [PATCH] org-colview: Fix dynblock match/maxlevel conflict * lisp/org-coplview.el (org-columns--capture-view): Combine the match and maxlevel arguments properly to construct the MATCH argument of `org-map-entries'. Specifying both `maxlevel' and `match' in a columnview dynamic block does not work: the `match' argument is ignored in that case. See the link below for a (not so minimal) ECM. Reported-by: Pablo A Perez-Fernandez Link: https://emacs.stackexchange.com/questions/66658/filter-columnview-dblock-on-properties-or-tags --- lisp/org-colview.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 2e1c29a99..7144308ff 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -1398,8 +1398,9 @@ other rows. Each row is a list of fields, as strings, or (org-get-tags)))) (push (cons (org-reduced-level (org-current-level)) (nreverse row)) table))))) - (or (and maxlevel (format "LEVEL<=%d" maxlevel)) - (and match match)) + (if match + (concat match (and maxlevel (format "+LEVEL<=%d" maxlevel))) + (and maxlevel (format "LEVEL<=%d" maxlevel))) (and local 'tree) 'archive 'comment) (org-columns-quit)