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

lang/org: refactor & reformat

Browse source 
To ensure that users' after! blocks have precendence over org packages
in sub-modules.
This commit is contained in:
Henrik Lissner 2019-07-08 22:07:52 +02:00
parent 52dc5001bc
commit 92dd66f736
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,9 +111,6 @@
if (funcall fn (eq (car p) key)) if (funcall fn (eq (car p) key))
collect p)) collect p))
(when (featurep! +ipython)
(load! "contrib/ipython"))
;; Fixes for various babel plugins ;; Fixes for various babel plugins
(setq org-babel-js-function-wrapper "console.log(require('util').inspect(function(){\n%s\n}()));")) (setq org-babel-js-function-wrapper "console.log(require('util').inspect(function(){\n%s\n}()));"))
@ -836,13 +833,14 @@ compelling reason, so..."
(message "`org' was already loaded by the time lang/org loaded, this may cause issues") (message "`org' was already loaded by the time lang/org loaded, this may cause issues")
(run-hooks 'org-load-hook)) (run-hooks 'org-load-hook))
:config
(add-hook 'org-open-at-point-functions #'doom|set-jump)
;;; Custom org modules ;;; Custom org modules
(if (featurep! +dragndrop) (load! "contrib/dragndrop")) (if (featurep! +dragndrop) (load! "contrib/dragndrop"))
(if (featurep! +ipython) (load! "contrib/ipython"))
(if (featurep! +present) (load! "contrib/present")) (if (featurep! +present) (load! "contrib/present"))
:config
(add-hook 'org-open-at-point-functions #'doom|set-jump)
;;; Packages ;;; Packages
(after! toc-org (after! toc-org
(setq toc-org-hrefify-default "gh") (setq toc-org-hrefify-default "gh")

19
modules/lang/org/contrib/ipython.el
View file

@ -16,22 +16,19 @@
'(("\\*ob-ipython.*" '(("\\*ob-ipython.*"
:slot 2 :side right :size 100 :height 0.2 :slot 2 :side right :size 100 :height 0.2
:select nil :quit nil :transient nil) :select nil :quit nil :transient nil)
("^\\*Python" ("^ ?\\*Python"
:slot 0 :side right :size 100 :slot 0 :side right :size 100
:select nil :quit nil :ttl nil) :select nil :quit nil :ttl nil)))
("\\*Python:.*"
:slot 0 :side right :size 100
:select nil :quit nil :transient nil)))
;; advices for remote kernel and org-src-edit ;; advices for remote kernel and org-src-edit
(advice-add 'ob-ipython--create-repl :override #'+org*ob-ipython--create-repl) (advice-add #'ob-ipython--create-repl :override #'+org*ob-ipython--create-repl)
(advice-add 'org-babel-edit-prep:ipython :override #'+org*org-babel-edit-prep:ipython) (advice-add #'org-babel-edit-prep:ipython :override #'+org*org-babel-edit-prep:ipython)
(advice-add 'org-babel-execute:ipython :override #'+org*org-babel-execute:ipython) (advice-add #'org-babel-execute:ipython :override #'+org*org-babel-execute:ipython)
(advice-add 'org-babel-ipython-initiate-session :override #'+org*org-babel-ipython-initiate-session) (advice-add #'org-babel-ipython-initiate-session :override #'+org*org-babel-ipython-initiate-session)
;; retina resolution image hack ;; retina resolution image hack
(when (eq window-system 'ns) (when IS-MAC
(advice-add 'ob-ipython--write-base64-string :around #'+org*ob-ipython--write-base64-string)) (advice-add #'ob-ipython--write-base64-string :around #'+org*ob-ipython--write-base64-string))
;; ipython has its own async keyword, disable ipython in ob-async. ;; ipython has its own async keyword, disable ipython in ob-async.
(after! ob-async (after! ob-async