From 82827c8035b543bd8713b370d3a26aae4b95042f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Kryger?= Date: Wed, 4 Dec 2024 06:57:31 +0000 Subject: [PATCH] Ensure org exporters are loaded and load org early --- init.el | 6 +++++- modules/init-org.el | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/init.el b/init.el index 58dd8db0..6c53a6b0 100644 --- a/init.el +++ b/init.el @@ -371,6 +371,11 @@ after it's been byte compiled." (setq custom-theme-directory exordium-themes-dir) (exordium-require 'init-progress-bar nil) +;; `org' may be upgraded from ELPA (for example, as a part of a first start) +;; and some packages depend on it. To prevent loading a built in version by +;; such packages upgrade it early. +(exordium-require 'init-org) + (when exordium-nw (set-face-background 'highlight nil)) (when exordium-theme @@ -426,7 +431,6 @@ after it's been byte compiled." ;; Major modes (exordium-require 'init-markdown) -(exordium-require 'init-org) (exordium-require 'init-xml) ;; OS-specific things diff --git a/modules/init-org.el b/modules/init-org.el index f07831a9..cc191260 100644 --- a/modules/init-org.el +++ b/modules/init-org.el @@ -129,14 +129,12 @@ set to nil." (use-package ox-html :ensure org - :defer t :after (org) :if (not exordium-org-export-css)) (use-package ox-html :ensure org :after (org) - :defer t :if exordium-org-export-css :custom (org-html-htmlize-output-type 'css @@ -147,30 +145,25 @@ set to nil." (use-package ox-md :ensure org :after (org) - :defer t :if exordium-enable-org-export) (use-package ox-beamer :ensure org :after (org) - :defer t :if exordium-enable-org-export) (use-package ox-odt :ensure org :after (org) - :defer t :if exordium-enable-org-export) (use-package ox-publish :ensure org :after (org) - :defer t :if exordium-enable-org-export) (use-package ox-gfm :after (org) - :defer t :if exordium-enable-org-export) (provide 'init-org)