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

lang/org: fix org-ditaa jar paths

Browse source 
Now also includes contrib/scripts in org-mode's build directory.
This commit is contained in:
Henrik Lissner 2021-04-21 19:21:54 -04:00
parent bddb2b2a2d
commit f621ff8047
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -272,6 +272,12 @@ Also adds support for a `:sync' parameter to override `:async'."
(after! python (after! python
(setq org-babel-python-command python-shell-interpreter)) (setq org-babel-python-command python-shell-interpreter))
(after! ob-ditaa
;; TODO Should be fixed upstream
(let ((default-directory (org-find-library-dir "org-contribdir")))
(setq org-ditaa-jar-path (expand-file-name "scripts/ditaa.jar")
org-ditaa-eps-jar-path (expand-file-name "scripts/DitaaEps.jar"))))
;; NOTE Backported from Emacs 27.1 ;; NOTE Backported from Emacs 27.1
;; DEPRECATED Remove when 26.x support is dropped ;; DEPRECATED Remove when 26.x support is dropped
(unless EMACS27+ (unless EMACS27+

2
modules/lang/org/packages.el
View file

@ -6,7 +6,7 @@
(package! org-mode (package! org-mode
:recipe (:host github :recipe (:host github
:repo "emacs-straight/org-mode" :repo "emacs-straight/org-mode"
:files ("*.el" "lisp/*.el" "contrib/lisp/*.el") :files ("*.el" "lisp/*.el" "contrib/lisp/*.el" "contrib/scripts")
;; HACK A necessary hack because org requires a compilation step ;; HACK A necessary hack because org requires a compilation step
;; after being cloned, and during that compilation a ;; after being cloned, and during that compilation a
;; org-version.el is generated with these two functions, which ;; org-version.el is generated with these two functions, which