From bef3a482f39179c1360f43deccac19a171de2ff2 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Fri, 31 Mar 2023 16:30:39 +0200 Subject: [PATCH] Explicitly require `org-ql-search` when loading `org-ql` `org-ql-search.ql` contains the definitions for Org QL dynamic blocks but is not automatically loaded by `org-ql.el`. Since I am using Org QL dynamic blocks extensively, let's load this library explicitly when `org-ql.el` is activated. Note that this implicitly reverts 939b1e882a7ff9e0390bce52018a3c091116f7b8, which changed the use-package declaration from `org-ql-search` to `org-ql` proper. So this commit was wrong after all (and the state before that commit was right), but having a use-package declaration for `org-ql` instead of some of its sublibraries seems to be clearer to me. --- init.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index 288d680..c92bec6 100644 --- a/init.el +++ b/init.el @@ -982,7 +982,6 @@ ;; Extended query language and dynamic blocks (use-package org-ql - :ensure org-ql :pin "melpa-stable" ;; XXX: Remove the following as soon as this is fixed in upstream, see ;; https://github.com/alphapapa/org-ql/pull/237 @@ -991,7 +990,11 @@ (optional "-" (repeat 1 2 digit) ":" (repeat 2 digit)))) :commands (org-ql-view org-ql-search - org-dblock-write:org-ql)) + org-dblock-write:org-ql) + ;; `org-ql-search' defines the dblock features of `org-ql' but is not loaded + ;; by default, so let's do this here; note that this implicitly loads + ;; `org-ql-view' as well. + :config (require 'org-ql-search)) (use-package ol :init (setq org-link-keep-stored-after-insertion t)