From efb6938748e8057a4a4c37b82bf334568c3d9fa8 Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Fri, 14 Dec 2018 23:55:51 -0600 Subject: [PATCH] Fix: (org-ql-agenda) Restore super-groups functionality Fixes #17. Thanks to Dustin Lacewell (@dustinlacewell). --- org-ql-agenda.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/org-ql-agenda.el b/org-ql-agenda.el index 33e6c6f..163351d 100644 --- a/org-ql-agenda.el +++ b/org-ql-agenda.el @@ -65,11 +65,12 @@ When nil, buffers are widened before being searched. BUFFER, when non-nil, is a buffer or buffer name to display the agenda in, rather than the default." (declare (indent defun) - (advertised-calling-convention (files-or-query &optional query &key sort narrow buffer) nil)) + (advertised-calling-convention (files-or-query &optional query &key sort narrow buffer super-groups) nil)) (cl-macrolet ((set-keyword-args (args) `(setq sort (plist-get ,args :sort) narrow (plist-get ,args :narrow) - buffer (plist-get ,args :buffer)))) + buffer (plist-get ,args :buffer) + super-groups (plist-get ,args :super-groups)))) (let ((files '(org-agenda-files)) query sort narrow buffer) ;; Parse args manually (so we can leave FILES nil for a default argument). @@ -98,18 +99,20 @@ agenda in, rather than the default." ',query :sort ',sort :buffer ,buffer - :narrow ,narrow)))) + :narrow ,narrow + :super-groups ,super-groups)))) ;;;; Functions ;; TODO: Move the action-fn down into --filter-buffer, so users can avoid calling the ;; headline-parser when they don't need it. -(cl-defun org-ql-agenda--agenda (buffers-files query &key sort buffer narrow) +(cl-defun org-ql-agenda--agenda (buffers-files query &key sort buffer narrow super-groups) "FIXME: Docstring" (declare (indent defun)) ;; I think it's reasonable to use `eval' here. - (let* ((entries (--> (eval `(org-ql ',buffers-files + (let* ((org-super-agenda-groups super-groups) + (entries (--> (eval `(org-ql ',buffers-files ,query :sort ,sort :markers t