diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2013-09-29 22:20:54 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2013-09-29 22:21:07 +0200 |
commit | fbd604d7f5ec2abf4fc24538e613315e73561450 (patch) | |
tree | fcad2425c223b41729e55f53f12b98a67660f457 | |
parent | afeff01f776552b8df67cd344f4130a32f466950 (diff) | |
parent | c076b41c9e6d9c0868fabd0a90a8ff6cf55fd4ad (diff) | |
download | org-mode-fbd604d7f5ec2abf4fc24538e613315e73561450.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | doc/org.texi | 1 | ||||
-rw-r--r-- | lisp/ob-lisp.el | 29 |
2 files changed, 15 insertions, 15 deletions
diff --git a/doc/org.texi b/doc/org.texi index 8bd77af..0569465 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -847,7 +847,6 @@ The version 7.3 of this manual is available as a @uref{http://www.network-theory.co.uk/org/manual/, paperback book from Network Theory Ltd.} -@page @node Installation diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el index 2bb1a25..68dfacc 100644 --- a/lisp/ob-lisp.el +++ b/lisp/ob-lisp.el @@ -77,21 +77,22 @@ current directory string." (org-babel-reassemble-table ((lambda (result) (org-babel-result-cond (cdr (assoc :result-params params)) - (car result) + result (condition-case nil - (read (org-babel-lisp-vector-to-list (cadr result))) - (error (cadr result))))) - (with-temp-buffer - (insert (org-babel-expand-body:lisp body params)) - (slime-eval `(swank:eval-and-grab-output - ,(let ((dir (if (assoc :dir params) - (cdr (assoc :dir params)) - default-directory))) - (format - (if dir (format org-babel-lisp-dir-fmt dir) "(progn %s)") - (buffer-substring-no-properties - (point-min) (point-max))))) - (cdr (assoc :package params))))) + (read (org-babel-lisp-vector-to-list result)) + (error result)))) + (funcall (if (member "output" (cdr (assoc :result-params params))) + #'car #'cadr) + (with-temp-buffer + (insert (org-babel-expand-body:lisp body params)) + (slime-eval `(swank:eval-and-grab-output + ,(let ((dir (if (assoc :dir params) + (cdr (assoc :dir params)) + default-directory))) + (format (format org-babel-lisp-dir-fmt dir) + (buffer-substring-no-properties + (point-min) (point-max))))) + (cdr (assoc :package params)))))) (org-babel-pick-name (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) (org-babel-pick-name (cdr (assoc :rowname-names params)) |