Skip to content

Commit

Permalink
fix(org): revert minemacs-first-org-file, it causes Org export to fail
Browse files Browse the repository at this point in the history
  • Loading branch information
abougouffa committed Oct 16, 2023
1 parent 46fda3c commit 2466391
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 20 deletions.
21 changes: 10 additions & 11 deletions core/me-builtin.el
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,6 @@

(use-package org
:straight (:type built-in)
:after minemacs-first-org-file
:preface
;; Set to nil so we can detect user changes (in config.el)
(setq org-directory nil)
Expand Down Expand Up @@ -724,16 +723,16 @@
;; problem.
(use-package org-indent
:straight (:type built-in)
:after minemacs-first-org-file org
:after org
:demand t)

(use-package ox
:straight (:type built-in)
:after minemacs-first-org-file org)
:after org)

(use-package ox-latex
:straight (:type built-in)
:after minemacs-first-org-file ox
:after ox
:custom
(org-latex-src-block-backend 'engraved)
(org-latex-prefer-user-labels t)
Expand Down Expand Up @@ -788,20 +787,20 @@
'("tectonic -X compile --outdir=%o -Z shell-escape -Z continue-on-errors %f")))))

(use-package ox-koma-letter
:after minemacs-first-org-file ox
:after ox
:demand t)

(use-package ox-odt
:after minemacs-first-org-file ox
:after ox
:demand t)

(use-package ox-beamer
:after minemacs-first-org-file ox
:after ox
:demand t)

(use-package oc
:straight (:type built-in)
:after minemacs-first-org-file org
:after org
:demand t
:custom
(org-cite-export-processors '((latex biblatex) (t csl)))
Expand All @@ -812,17 +811,17 @@

(use-package oc-csl
:straight (:type built-in)
:after minemacs-first-org-file oc
:after oc
:demand t)

(use-package oc-natbib
:straight (:type built-in)
:after minemacs-first-org-file oc
:after oc
:demand t)

(use-package oc-biblatex
:straight (:type built-in)
:after minemacs-first-org-file oc
:after oc
:demand t)

(use-package ediff
Expand Down
16 changes: 7 additions & 9 deletions modules/me-org.el
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
:group 'minemacs)

(use-package me-org-extras
:after minemacs-first-org-file org
:after org
:demand t
:config
(+org-extras-outline-path-setup)
Expand All @@ -26,34 +26,33 @@

(use-package org-contrib
:straight t
:after minemacs-first-org-file org
:after org
:demand t)

(use-package engrave-faces
:straight t
:after minemacs-first-org-file org)
:after org)

;; Org export
(use-package ox-hugo
:straight t
:after minemacs-first-org-file ox
:after ox
:demand t)

(use-package ox-pandoc
:straight t
:after minemacs-first-org-file ox
:after ox
:demand t)

(use-package ox-extra
:after minemacs-first-org-file ox
:after ox
:demand t
:config
(ox-extras-activate '(latex-header-blocks ignore-headlines)))

;; Other Org features
(use-package org-appear
:straight t
:after minemacs-first-org-file
:hook (org-mode . org-appear-mode)
:custom
(org-appear-inside-latex t)
Expand Down Expand Up @@ -161,11 +160,10 @@

(use-package evil-org
:straight t
:after minemacs-first-org-file
:hook (org-mode . evil-org-mode))

(use-package evil-org-agenda
:after minemacs-first-org-file evil-org
:after evil-org
:demand t
:config
(evil-org-agenda-set-keys))
Expand Down

0 comments on commit 2466391

Please sign in to comment.