From 73a8e3be4b80f6d93f7ab4e320bcf43b76e0bcf2 Mon Sep 17 00:00:00 2001
From: Daniel Borchmann <daniel@algebra20.de>
Date: Sat, 22 Feb 2025 20:52:30 +0100
Subject: [PATCH] Do not depend on autoloading db-org.el for bookmark links

Let's keep db-org a collection of autoloadable functions and move the
actual configuration of Org bookmark links to init.el.
---
 init.el             | 7 ++++++-
 site-lisp/db-org.el | 8 ++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/init.el b/init.el
index 8111157..1e05c7a 100644
--- a/init.el
+++ b/init.el
@@ -572,7 +572,9 @@
              hydra-org-linking/body
              org-dblock-write:db/org-backlinks
              db/org-clock-goto-first-open-checkbox
-             org-password-manager-get-password-by-id))
+             org-password-manager-get-password-by-id
+             db/org-bookmark-open
+             db/org-bookmark-store-link))
 
 ;; This is to make the byte-compiler happy about setting some variables later on
 ;; that are defined in those packages.
@@ -759,6 +761,9 @@
                                                        (browse-url
                                                         (format "https://www.cve.org/CVERecord?id=CVE-%s"
                                                                 number))))
+            (org-link-set-parameters "bookmark"
+			             :follow #'db/org-bookmark-open
+			             :store #'db/org-bookmark-store-link)
             (when (eq system-type 'windows-nt)
               (org-link-set-parameters "onenote" :follow #'db/org-onenote-open)
               (org-link-set-parameters "outlook" :follow #'db/org-outlook-open))
diff --git a/site-lisp/db-org.el b/site-lisp/db-org.el
index 3ded8be..f47ab93 100644
--- a/site-lisp/db-org.el
+++ b/site-lisp/db-org.el
@@ -2228,15 +2228,11 @@ PARAMS may contain the following values:
 ;; The code in this section is based version 1.0 of `ol-bookmark.el' by Tokuya Kameshima;
 ;; see https://github.com/emacsmirror/org-contrib/blob/bd39cca48b1c4a8a1cdfb1cdd6be2ce700acdd97/lisp/ol-bookmark.el.
 
-(org-link-set-parameters "bookmark"
-			 :follow #'org-bookmark-open
-			 :store #'org-bookmark-store-link)
-
-(defun org-bookmark-open (bookmark _)
+(defun db/org-bookmark-open (bookmark _)
   "Visit the bookmark BOOKMARK."
   (bookmark-jump bookmark))
 
-(defun org-bookmark-store-link ()
+(defun db/org-bookmark-store-link ()
   "Store a link to the bookmark at point.
 
 When in Dired, try to find bookmark that points to the file at