diff options
| author | Sébastien Delafond <sdelafond@gmail.com> | 2015-08-25 12:27:35 +0200 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2015-08-25 14:22:00 +0200 |
| commit | 97c50971465ff7f49ef2f57b3c09060939778727 (patch) | |
| tree | 3da0aef5dd29bbe67a6e85b5a9a76b9b60b75d13 /lisp/ob-octave.el | |
| parent | a3a85ee67f2216f1d3c91e84474ba492ae9e1046 (diff) | |
Imported Upstream version 8.3.1
Diffstat (limited to 'lisp/ob-octave.el')
| -rw-r--r-- | lisp/ob-octave.el | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index 8cc66b6..14b55d2 100644 --- a/lisp/ob-octave.el +++ b/lisp/ob-octave.el @@ -82,18 +82,19 @@ end") (full-body (org-babel-expand-body:generic body params (org-babel-variable-assignments:octave params))) + (gfx-file (ignore-errors (org-babel-graphical-output-file params))) (result (org-babel-octave-evaluate session - (if (org-babel-octave-graphical-output-file params) + (if gfx-file (mapconcat 'identity (list "set (0, \"defaultfigurevisible\", \"off\");" full-body - (format "print -dpng %s" (org-babel-octave-graphical-output-file params))) + (format "print -dpng %s" gfx-file)) "\n") full-body) result-type matlabp))) - (if (org-babel-octave-graphical-output-file params) + (if gfx-file nil (org-babel-reassemble-table result @@ -268,11 +269,6 @@ This removes initial blank and comment lines and then calls (match-string 1 string) string)) -(defun org-babel-octave-graphical-output-file (params) - "Name of file to which maxima should send graphical output." - (and (member "graphics" (cdr (assq :result-params params))) - (cdr (assq :file params)))) - (provide 'ob-octave) |