mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-27 07:37:25 +00:00
Code

Merge branch 'hotfix-7.8.06'

Browse Source 
Conflicts:
	lisp/org-exp-blocks.el
This commit is contained in:
Bastien Guerry 2012-03-20 11:07:00 +01:00
commit fffd14fc3a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,7 @@
(eval-when-compile
(require 'cl))
(require 'org)
(require 'find-func)
(defun org-export-blocks-set (var value)
"Set the value of `org-export-blocks' and install fontification."
@ -233,7 +234,7 @@ which defaults to the value of `org-export-blocks-witheld'."
(file-name-as-directory
(expand-file-name
"../contrib"
(file-name-directory (or load-file-name buffer-file-name)))))))
(file-name-directory (find-library-name "org")))))))
"Path to the ditaa jar executable."
:group 'org-babel
:type 'string)