diff options
author | Sebastien Delafond <seb@debian.org> | 2013-12-29 17:44:50 +0100 |
---|---|---|
committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:31 +0200 |
commit | 6c5e25df62a8618951b30a669f875a93c7944e0b (patch) | |
tree | ddae85aa6440f29d4d0b4efa5ffa3d656900a8e8 /lisp/ob-maxima.el | |
parent | 489f1deda8d0ec93810c342b427c1920b8c47cbb (diff) | |
parent | 52fbfeb04b10aa78f24f339a352fe1161c0b37e4 (diff) |
Imported Debian patch 8.2.4-1
Diffstat (limited to 'lisp/ob-maxima.el')
-rw-r--r-- | lisp/ob-maxima.el | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el index 726d686..5be378e 100644 --- a/lisp/ob-maxima.el +++ b/lisp/ob-maxima.el @@ -65,8 +65,8 @@ "\n"))) (defun org-babel-execute:maxima (body params) - "Execute a block of Maxima entries with org-babel. This function is -called by `org-babel-execute-src-block'." + "Execute a block of Maxima entries with org-babel. +This function is called by `org-babel-execute-src-block'." (message "executing Maxima source code block") (let ((result-params (split-string (or (cdr (assoc :results params)) ""))) (result @@ -76,18 +76,18 @@ called by `org-babel-execute-src-block'." 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' " - (mapconcat - #'identity - (delq nil - (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 ""))))) + ;; " | grep -v batch | grep -v 'replaced' | sed '/^$/d' " + (let ((raw (org-babel-eval cmd ""))) + (mapconcat + #'identity + (delq nil + (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"))))) (if (org-babel-maxima-graphical-output-file params) nil (org-babel-result-cond result-params |