[bug#65753] [PATCH 1/2] feature: emacs-org-dynamic-agenda: Properly integrate with org-ql.

[Nicolas Graves via Guix-patches via <guix-patches@gnu.org>]

---
 src/rde/features/emacs-xyz.scm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/rde/features/emacs-xyz.scm b/src/rde/features/emacs-xyz.scm
index 0463a98a..74bbdf7a 100644
--- a/src/rde/features/emacs-xyz.scm
+++ b/src/rde/features/emacs-xyz.scm
@@ -4483,9 +4483,11 @@ package is unconfigured but it plays along with emacs-org-dynamic-agenda."
 
 (define* (feature-emacs-org-dynamic-agenda
           #:key
-          (emacs-org-dynamic-agenda emacs-org-dynamic-agenda))
-  "Configure org-dynamic-agenda for GNU Emacs."
+          (emacs-org-dynamic-agenda emacs-org-dynamic-agenda)
+          (emacs-org-ql-dynamic-agenda emacs-org-ql-dynamic-agenda))
+  "Configure org-dynamic-agenda or org-ql-dynamic-agenda for GNU Emacs."
   (ensure-pred file-like? emacs-org-dynamic-agenda)
+  (ensure-pred file-like? emacs-org-ql-dynamic-agenda)
 
   (define emacs-f-name 'org-dynamic-agenda)
   (define f-name (symbol-append 'emacs- emacs-f-name))
@@ -4495,12 +4497,19 @@ package is unconfigured but it plays along with emacs-org-dynamic-agenda."
      (rde-elisp-configuration-service
       emacs-f-name
       config
-      `((require 'org-dynamic-agenda))
+      `(,@(if (get-value 'emacs-org-ql config)
+              '((require 'org-ql-dynamic-agenda)
+                (setq org-agenda-include-diary nil))
+              '((require 'org-dynamic-agenda))))
       #:summary "\
 Org dynamic agenda"
-      #:commentary ""
+      #:commentary "\
+This hook records files that should be saved as agenda-files, making the refreshing
+and loading of org-agenda faster (and even faster with org-ql cache)."
       #:keywords '(convenience)
-      #:elisp-packages (list emacs-org-dynamic-agenda))))
+      #:elisp-packages (list (if (get-value 'emacs-org-ql config)
+                                 emacs-org-ql-dynamic-agenda
+                                 emacs-org-dynamic-agenda)))))
 
   (feature
    (name f-name)
-- 
2.41.0