diff options
author | Bastien Guerry <bzg@altern.org> | 2012-03-20 11:07:00 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-03-20 11:07:00 +0100 |
commit | fffd14fc3aad726eb936a3cb2b6e52a7c5245f48 (patch) | |
tree | 467cd129f2bd93129e26747d0efac6aa5b2277b8 | |
parent | c7a26931f0b58b0026b4041bb59809b275402859 (diff) | |
parent | 042950a8922e287703cdc50c43bce3d8403aca80 (diff) | |
download | org-mode-fffd14fc3aad726eb936a3cb2b6e52a7c5245f48.tar.gz |
Merge branch 'hotfix-7.8.06'
Conflicts:
lisp/org-exp-blocks.el
-rw-r--r-- | lisp/org-exp-blocks.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el index 78eaa15..7d466ce 100644 --- a/lisp/org-exp-blocks.el +++ b/lisp/org-exp-blocks.el @@ -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) |