ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ditaa.jar path 

The default path had become wrong after we moved org-exp-blocks to the
core, because it was defined relative to the location of the Lisp file.
This commit is contained in:
Carsten Dominik 2009-06-19 12:15:28 +02:00
parent 62142723fd
commit 4f0bbb66d0
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -1,5 +1,7 @@
2009-06-19 Carsten Dominik <carsten.dominik@gmail.com> 2009-06-19 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp-blocks.el (org-ditaa-jar-path): Fix default ditaa path.
* org-exp.el (org-infile-export-plist): Get macros also from * org-exp.el (org-infile-export-plist): Get macros also from
#+SETUPFILE. #+SETUPFILE.

16
lisp/org-exp-blocks.el
View File

@ -217,14 +217,14 @@ specified in BLOCKS which default to the value of
;;-------------------------------------------------------------------------------- ;;--------------------------------------------------------------------------------
;; ditaa: create images from ASCII art using the ditaa utility ;; ditaa: create images from ASCII art using the ditaa utility
(defvar org-ditaa-jar-path (expand-file-name (defvar org-ditaa-jar-path (expand-file-name
"ditaa.jar" "ditaa.jar"
(file-name-as-directory (file-name-as-directory
(expand-file-name (expand-file-name
"scripts" "scripts"
(file-name-as-directory (file-name-as-directory
(expand-file-name (expand-file-name
".." "../contrib"
(file-name-directory (or load-file-name buffer-file-name))))))) (file-name-directory (or load-file-name buffer-file-name)))))))
"Path to the ditaa jar executable") "Path to the ditaa jar executable")
(defun org-export-blocks-format-ditaa (body &rest headers) (defun org-export-blocks-format-ditaa (body &rest headers)