summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2009-06-19 12:15:28 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2009-06-19 12:15:28 +0200
commit4f0bbb66d0cea141ecb0db6b47cae9de9c927aa5 (patch)
tree6115ccc8f67de45ee3cba5819db113e3a2cc5d57
parent62142723fdab0c0ab438287b7211201f297005bc (diff)
downloadorg-mode-4f0bbb66d0cea141ecb0db6b47cae9de9c927aa5.tar.gz
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.
-rwxr-xr-xlisp/ChangeLog2
-rw-r--r--lisp/org-exp-blocks.el16
2 files changed, 10 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64ca411..7f551b4 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
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
#+SETUPFILE.
diff --git a/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el
index 56adb9f..1fbaa2a 100644
--- a/lisp/org-exp-blocks.el
+++ b/lisp/org-exp-blocks.el
@@ -217,14 +217,14 @@ specified in BLOCKS which default to the value of
;;--------------------------------------------------------------------------------
;; ditaa: create images from ASCII art using the ditaa utility
(defvar org-ditaa-jar-path (expand-file-name
- "ditaa.jar"
- (file-name-as-directory
- (expand-file-name
- "scripts"
- (file-name-as-directory
- (expand-file-name
- ".."
- (file-name-directory (or load-file-name buffer-file-name)))))))
+ "ditaa.jar"
+ (file-name-as-directory
+ (expand-file-name
+ "scripts"
+ (file-name-as-directory
+ (expand-file-name
+ "../contrib"
+ (file-name-directory (or load-file-name buffer-file-name)))))))
"Path to the ditaa jar executable")
(defun org-export-blocks-format-ditaa (body &rest headers)