From f621ff80471e8d08a72e5ece00641c70b121873a Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 21 Apr 2021 19:21:54 -0400 Subject: [PATCH] lang/org: fix org-ditaa jar paths Now also includes contrib/scripts in org-mode's build directory. --- modules/lang/org/config.el | 6 ++++++ modules/lang/org/packages.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 79afb071c..ea8580b90 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -272,6 +272,12 @@ Also adds support for a `:sync' parameter to override `:async'." (after! python (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 ;; DEPRECATED Remove when 26.x support is dropped (unless EMACS27+ diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index 17928959e..6081d63d1 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -6,7 +6,7 @@ (package! org-mode :recipe (:host github :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 ;; after being cloned, and during that compilation a ;; org-version.el is generated with these two functions, which