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.
This commit is contained in:
Daniel Borchmann 2025-02-22 20:52:30 +01:00
parent 795fcde3b8
commit 73a8e3be4b
No known key found for this signature in database
GPG Key ID: 784AA8DF0CCDF625
2 changed files with 8 additions and 7 deletions

View File

@ -572,7 +572,9 @@
hydra-org-linking/body hydra-org-linking/body
org-dblock-write:db/org-backlinks org-dblock-write:db/org-backlinks
db/org-clock-goto-first-open-checkbox 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 ;; This is to make the byte-compiler happy about setting some variables later on
;; that are defined in those packages. ;; that are defined in those packages.
@ -759,6 +761,9 @@
(browse-url (browse-url
(format "https://www.cve.org/CVERecord?id=CVE-%s" (format "https://www.cve.org/CVERecord?id=CVE-%s"
number)))) number))))
(org-link-set-parameters "bookmark"
:follow #'db/org-bookmark-open
:store #'db/org-bookmark-store-link)
(when (eq system-type 'windows-nt) (when (eq system-type 'windows-nt)
(org-link-set-parameters "onenote" :follow #'db/org-onenote-open) (org-link-set-parameters "onenote" :follow #'db/org-onenote-open)
(org-link-set-parameters "outlook" :follow #'db/org-outlook-open)) (org-link-set-parameters "outlook" :follow #'db/org-outlook-open))

View File

@ -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; ;; 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. ;; see https://github.com/emacsmirror/org-contrib/blob/bd39cca48b1c4a8a1cdfb1cdd6be2ce700acdd97/lisp/ol-bookmark.el.
(org-link-set-parameters "bookmark" (defun db/org-bookmark-open (bookmark _)
:follow #'org-bookmark-open
:store #'org-bookmark-store-link)
(defun org-bookmark-open (bookmark _)
"Visit the bookmark BOOKMARK." "Visit the bookmark BOOKMARK."
(bookmark-jump bookmark)) (bookmark-jump bookmark))
(defun org-bookmark-store-link () (defun db/org-bookmark-store-link ()
"Store a link to the bookmark at point. "Store a link to the bookmark at point.
When in Dired, try to find bookmark that points to the file at When in Dired, try to find bookmark that points to the file at