diff options
| author | Bastien Guerry <bzg@gnu.org> | 2013-11-12 14:06:26 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2013-11-12 14:06:26 +0100 |
| commit | 271672fad74cdbc9065d23d6e6cee1b8540f571b (patch) | |
| tree | d322b956ec0e74ee33b22354ef00839b23b1618d /lisp/org/ob-picolisp.el | |
| parent | f201cf3a8143b0b34b07769fc7d73dd14761b87b (diff) | |
| download | emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.tar.gz emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.tar.bz2 emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.zip | |
Merge Org version 8.2.3a.
Diffstat (limited to 'lisp/org/ob-picolisp.el')
| -rw-r--r-- | lisp/org/ob-picolisp.el | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lisp/org/ob-picolisp.el b/lisp/org/ob-picolisp.el index 1029b6f2a94..1d1791926c5 100644 --- a/lisp/org/ob-picolisp.el +++ b/lisp/org/ob-picolisp.el @@ -54,8 +54,6 @@ ;;; Code: (require 'ob) -(require 'ob-eval) -(require 'ob-comint) (require 'comint) (eval-when-compile (require 'cl)) @@ -80,7 +78,7 @@ :version "24.1" :type 'string) -(defun org-babel-expand-body:picolisp (body params &optional processed-params) +(defun org-babel-expand-body:picolisp (body params) "Expand BODY according to PARAMS, return the expanded body." (let ((vars (mapcar #'cdr (org-babel-get-header params :var))) (result-params (cdr (assoc :result-params params))) @@ -123,13 +121,8 @@ (t full-body)))) ((lambda (result) - (if (or (member "verbatim" result-params) - (member "scalar" result-params) - (member "output" result-params) - (member "code" result-params) - (member "pp" result-params) - (= (length result) 0)) - result + (org-babel-result-cond result-params + result (read result))) (if (not (string= session-name "none")) ;; session based evaluation |