From d25d477b4f59315b4ace3621a7ed65e9190dfb7e Mon Sep 17 00:00:00 2001 From: Victor Deryagin Date: Mon, 23 Aug 2021 01:41:58 +0300 Subject: [PATCH] (refactor): ensure dependencies are loaded for org-roam-utils.el (#1799) If org-roam-utils.el is byte-compiled when org-macs is not loaded (`org-with-point-at` macro missing), error can appear about missing `org-with-point-at`. --- org-roam-utils.el | 2 ++ org-roam.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/org-roam-utils.el b/org-roam-utils.el index 5d8a9d4..ae6cc89 100644 --- a/org-roam-utils.el +++ b/org-roam-utils.el @@ -32,6 +32,8 @@ ;; ;;; Code: +(require 'org-roam) + ;;; String utilities ;; TODO Refactor this. (defun org-roam-replace-string (old new s) diff --git a/org-roam.el b/org-roam.el index 005697a..9b2dda8 100644 --- a/org-roam.el +++ b/org-roam.el @@ -94,7 +94,6 @@ (eval-when-compile (require 'subr-x)) -(require 'org-roam-utils) (require 'org-roam-compat) ;;; Options @@ -310,6 +309,7 @@ E.g. (\".org\") => (\"*.org\" \"*.org.gpg\")" (provide 'org-roam) (cl-eval-when (load eval) + (require 'org-roam-utils) (require 'org-roam-db) (require 'org-roam-node) (require 'org-roam-capture)