diff options
author | Bastien Guerry <bastien1@free.fr> | 2012-04-01 11:49:25 +0200 |
---|---|---|
committer | Bastien Guerry <bastien1@free.fr> | 2012-04-01 11:49:25 +0200 |
commit | 153ae947f845f6d4f31d3d239a1449899c3384f0 (patch) | |
tree | b7ef6c7f4b94f4a4ee19eecd079c36aff84bddc5 /lisp/org/ob-maxima.el | |
parent | 42ee526b1adbe2ba7766203980a9d7089aae1a68 (diff) | |
download | emacs-153ae947f845f6d4f31d3d239a1449899c3384f0.tar.gz |
Update to Org version 7.8.07 (commit da0e6f in Org's repo)
Diffstat (limited to 'lisp/org/ob-maxima.el')
-rw-r--r-- | lisp/org/ob-maxima.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/org/ob-maxima.el b/lisp/org/ob-maxima.el index 74bcb069434..8da20af74fb 100644 --- a/lisp/org/ob-maxima.el +++ b/lisp/org/ob-maxima.el @@ -40,6 +40,11 @@ (defvar org-babel-default-header-args:maxima '()) +(defcustom org-babel-maxima-command + (if (boundp 'maxima-command) maxima-command "maxima") + "Command used to call maxima on the shell." + :group 'org-babel) + (defun org-babel-maxima-expand (body params) "Expand a block of Maxima code according to its header arguments." (let ((vars (mapcar #'cdr (org-babel-get-header params :var)))) @@ -67,8 +72,8 @@ called by `org-babel-execute-src-block'." (result (let* ((cmdline (cdr (assoc :cmdline params))) (in-file (org-babel-temp-file "maxima-" ".max")) - (cmd (format "maxima --very-quiet -r 'batchload(%S)$' %s" - in-file cmdline))) + (cmd (format "%s --very-quiet -r 'batchload(%S)$' %s" + org-babel-maxima-command in-file cmdline))) (with-temp-file in-file (insert (org-babel-maxima-expand body params))) (message cmd) ((lambda (raw) ;; " | grep -v batch | grep -v 'replaced' | sed '/^$/d' " |