mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-12 06:09:54 +00:00
Merge branch 'origin-hotfix-7.8.06'
This commit is contained in:
commit
2ef04872ed
|
@ -40,6 +40,10 @@
|
||||||
|
|
||||||
(defvar org-babel-default-header-args:maxima '())
|
(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.")
|
||||||
|
|
||||||
(defun org-babel-maxima-expand (body params)
|
(defun org-babel-maxima-expand (body params)
|
||||||
"Expand a block of Maxima code according to its header arguments."
|
"Expand a block of Maxima code according to its header arguments."
|
||||||
(let ((vars (mapcar #'cdr (org-babel-get-header params :var))))
|
(let ((vars (mapcar #'cdr (org-babel-get-header params :var))))
|
||||||
|
@ -67,8 +71,8 @@ called by `org-babel-execute-src-block'."
|
||||||
(result
|
(result
|
||||||
(let* ((cmdline (cdr (assoc :cmdline params)))
|
(let* ((cmdline (cdr (assoc :cmdline params)))
|
||||||
(in-file (org-babel-temp-file "maxima-" ".max"))
|
(in-file (org-babel-temp-file "maxima-" ".max"))
|
||||||
(cmd (format "maxima --very-quiet -r 'batchload(%S)$' %s"
|
(cmd (format "%s --very-quiet -r 'batchload(%S)$' %s"
|
||||||
in-file cmdline)))
|
org-babel-maxima-command in-file cmdline)))
|
||||||
(with-temp-file in-file (insert (org-babel-maxima-expand body params)))
|
(with-temp-file in-file (insert (org-babel-maxima-expand body params)))
|
||||||
(message cmd)
|
(message cmd)
|
||||||
((lambda (raw) ;; " | grep -v batch | grep -v 'replaced' | sed '/^$/d' "
|
((lambda (raw) ;; " | grep -v batch | grep -v 'replaced' | sed '/^$/d' "
|
||||||
|
|
Loading…
Reference in a new issue