mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-15 16:16:26 +00:00
Code Releases Activity

org-exp-blocks.el (org-ditaa-jar-path): Fix merge conflict.

Browse source 
* org-exp-blocks.el (org-ditaa-jar-path): Fix merge conflict.
This commit is contained in:
Bastien Guerry 2012-03-20 03:18:50 +01:00
parent ba249353d3
commit da24a0131f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/org-exp-blocks.el
View file

@ -233,7 +233,9 @@ which defaults to the value of `org-export-blocks-witheld'."
(expand-file-name
"../contrib"
(file-name-directory (find-library-name "org")))))))
"Path to the ditaa jar executable.")
"Path to the ditaa jar executable."
:group 'org-babel
:type 'string)
(defvar org-export-current-backend) ; dynamically bound in org-exp.el
(defun org-export-blocks-format-ditaa (body &rest headers)