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

remove duplicate definition of org-ditaa-jar-path 

* lisp/ob-ditaa.el (org-ditaa-jar-path): Already defined in
  org-exp-blocks.el.
* lisp/org-exp-blocks.el (org-ditaa-jar-path): Declare appropriately
  for the fact that this is really now a Babel thing -- even if it is
  used here and the definition should remain here for reasons of load
  dependencies.
This commit is contained in:
Eric Schulte 2012-02-29 09:25:27 -07:00
parent 87fe06b313
commit deb376ff4f
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ob-ditaa.el
View File

@ -37,6 +37,7 @@
;;; Code: ;;; Code:
(require 'ob) (require 'ob)
(require 'org-exp-blocks)
(defvar org-babel-default-header-args:ditaa (defvar org-babel-default-header-args:ditaa
'((:results . "file") '((:results . "file")
@ -44,11 +45,6 @@
(:java . "-Dfile.encoding=UTF-8")) (:java . "-Dfile.encoding=UTF-8"))
"Default arguments for evaluating a ditaa source block.") "Default arguments for evaluating a ditaa source block.")
(defcustom org-ditaa-jar-path nil
"Path for the ditaa jar file."
:group 'org-babel
:type 'string)
(defcustom org-ditaa-jar-option "-jar" (defcustom org-ditaa-jar-option "-jar"
"Option for the ditaa jar file. "Option for the ditaa jar file.
Do not leave leading or trailing spaces in this string." Do not leave leading or trailing spaces in this string."

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

@ -225,7 +225,7 @@ which defaults to the value of `org-export-blocks-witheld'."
;;-------------------------------------------------------------------------------- ;;--------------------------------------------------------------------------------
;; 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 (defcustom 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
@ -234,7 +234,9 @@ which defaults to the value of `org-export-blocks-witheld'."
(expand-file-name (expand-file-name
"../contrib" "../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."
:group 'org-babel
:type 'string)
(defvar org-export-current-backend) ; dynamically bound in org-exp.el (defvar org-export-current-backend) ; dynamically bound in org-exp.el
(defun org-export-blocks-format-ditaa (body &rest headers) (defun org-export-blocks-format-ditaa (body &rest headers)