emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang/org: move submodule hooks to back of org hooks

Browse source 
So they have an opportunity to override defaults.
This commit is contained in:
Henrik Lissner 2020-04-08 15:17:56 -04:00
parent fbbc7535ea
commit 2957f5ff28
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/lang/org/config.el
View file

@ -886,6 +886,8 @@ compelling reason, so..."
org-publish-timestamp-directory (concat doom-cache-dir "org-timestamps/") org-publish-timestamp-directory (concat doom-cache-dir "org-timestamps/")
org-preview-latex-image-directory (concat doom-cache-dir "org-latex/")) org-preview-latex-image-directory (concat doom-cache-dir "org-latex/"))
;; Make most of the default modules opt-in, because I sincerely doubt most
;; users use all of them.
(defvar org-modules (defvar org-modules
'(;; ol-w3m '(;; ol-w3m
;; ol-bbdb ;; ol-bbdb
@ -899,8 +901,18 @@ compelling reason, so..."
;; ol-eww ;; ol-eww
)) ))
(add-hook 'org-mode-local-vars-hook #'eldoc-mode) ;;; Custom org modules
(if (featurep! +brain) (load! "contrib/brain"))
(if (featurep! +dragndrop) (load! "contrib/dragndrop"))
(if (featurep! +ipython) (load! "contrib/ipython"))
(if (featurep! +journal) (load! "contrib/journal"))
(if (featurep! +jupyter) (load! "contrib/jupyter"))
(if (featurep! +pomodoro) (load! "contrib/pomodoro"))
(if (featurep! +present) (load! "contrib/present"))
(if (featurep! +roam) (load! "contrib/roam"))
;; Add our general hooks after the submodules, so that any hooks the
;; submodules add run after them, and can overwrite any defaults if necessary.
(add-hook! 'org-mode-hook (add-hook! 'org-mode-hook
;; `show-paren-mode' causes flickering with indent overlays made by ;; `show-paren-mode' causes flickering with indent overlays made by
;; `org-indent-mode', so we turn off show-paren-mode altogether ;; `org-indent-mode', so we turn off show-paren-mode altogether
@ -928,15 +940,9 @@ compelling reason, so..."
#'+org-init-protocol-h #'+org-init-protocol-h
#'+org-init-protocol-lazy-loader-h) #'+org-init-protocol-lazy-loader-h)
;;; Custom org modules ;; (Re)activate eldoc-mode in org-mode a little later, because it disables
(if (featurep! +brain) (load! "contrib/brain")) ;; itself if started too soon (which is the case with `global-eldoc-mode').
(if (featurep! +dragndrop) (load! "contrib/dragndrop")) (add-hook 'org-mode-local-vars-hook #'eldoc-mode)
(if (featurep! +ipython) (load! "contrib/ipython"))
(if (featurep! +journal) (load! "contrib/journal"))
(if (featurep! +jupyter) (load! "contrib/jupyter"))
(if (featurep! +pomodoro) (load! "contrib/pomodoro"))
(if (featurep! +present) (load! "contrib/present"))
(if (featurep! +roam) (load! "contrib/roam"))
;; In case the user has eagerly loaded org from their configs ;; In case the user has eagerly loaded org from their configs
(when (and (featurep 'org) (when (and (featurep 'org)