diff options
Diffstat (limited to 'contrib/lisp/ob-mathematica.el')
| -rw-r--r-- | contrib/lisp/ob-mathematica.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/contrib/lisp/ob-mathematica.el b/contrib/lisp/ob-mathematica.el index a796741..cb35dec 100644 --- a/contrib/lisp/ob-mathematica.el +++ b/contrib/lisp/ob-mathematica.el @@ -14,6 +14,9 @@ (require 'ob-ref) (require 'ob-comint) (require 'ob-eval) + +(declare-function org-trim "org" (s &optional keep-lead)) + ;; Optionally require mma.el for font lock, etc (require 'mma nil 'noerror) (add-to-list 'org-src-lang-modes '("mathematica" . "mma")) @@ -31,7 +34,7 @@ (defun org-babel-expand-body:mathematica (body params) "Expand BODY according to PARAMS, return the expanded body." - (let ((vars (mapcar #'cdr (org-babel-get-header params :var)))) + (let ((vars (org-babel--get-vars params))) (concat (mapconcat ;; define any variables (lambda (pair) @@ -43,11 +46,11 @@ (defun org-babel-execute:mathematica (body params) "Execute a block of Mathematica code with org-babel. This function is called by `org-babel-execute-src-block'" - (let* ((result-params (cdr (assoc :result-params params))) + (let* ((result-params (cdr (assq :result-params params))) (full-body (org-babel-expand-body:mathematica body params)) (tmp-script-file (org-babel-temp-file "mathematica-")) (cmd org-babel-mathematica-command)) - ;; actually execute the source-code block + ;; actually execute the source-code block (with-temp-file tmp-script-file (insert full-body)) ;; (with-temp-file "/tmp/dbg" (insert full-body)) ((lambda (raw) @@ -56,7 +59,7 @@ called by `org-babel-execute-src-block'" (and (member "output" result-params) (not (member "table" result-params)))) raw - (org-babel-script-escape (org-babel-trim raw)))) + (org-babel-script-escape (org-trim raw)))) (org-babel-eval (concat cmd " " tmp-script-file) "")))) (defun org-babel-prep-session:mathematica (session params) @@ -76,4 +79,3 @@ specifying a variable of the same value." (format "%S" var))) (provide 'ob-mathematica) - |