Skip to content

Commit

Permalink
Ensure org exporters are loaded and load org early
Browse files Browse the repository at this point in the history
  • Loading branch information
pkryger committed Dec 4, 2024
1 parent 1e02586 commit 82827c8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
6 changes: 5 additions & 1 deletion init.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions modules/init-org.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 82827c8

Please sign in to comment.