summaryrefslogtreecommitdiff
path: root/lisp/ob-maxima.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ob-maxima.el')
-rw-r--r--lisp/ob-maxima.el9
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
index 06fa3cf..726d686 100644
--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@@ -1,6 +1,6 @@
;;; ob-maxima.el --- org-babel functions for maxima evaluation
-;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
;; Author: Eric S Fraga
;; Eric Schulte
@@ -83,16 +83,15 @@ called by `org-babel-execute-src-block'."
(mapcar (lambda (line)
(unless (or (string-match "batch" line)
(string-match "^rat: replaced .*$" line)
+ (string-match "^;;; Loading #P" line)
(= 0 (length line)))
line))
(split-string raw "[\r\n]"))) "\n"))
(org-babel-eval cmd "")))))
(if (org-babel-maxima-graphical-output-file params)
nil
- (if (or (member "scalar" result-params)
- (member "verbatim" result-params)
- (member "output" result-params))
- result
+ (org-babel-result-cond result-params
+ result
(let ((tmp-file (org-babel-temp-file "maxima-res-")))
(with-temp-file tmp-file (insert result))
(org-babel-import-elisp-from-file tmp-file))))))