summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2011-04-07 11:31:56 -0600
committerEric Schulte <schulte.eric@gmail.com>2011-04-07 11:31:56 -0600
commitad976c66cb5a5181294a5eb6ac0989fd8b06182c (patch)
tree3ea057a52c39bcf6e2ec68b5015077369994c35d
parent27fe8e0dd74bcd742420f248e40cf890e80afcea (diff)
downloadorg-mode-ad976c66cb5a5181294a5eb6ac0989fd8b06182c.tar.gz
ob-lisp: now reads/applies :colnames and :rownames header arguments
* lisp/ob-lisp.el (org-babel-execute:lisp): Now using `org-babel-reassemble-table' to apply the appropriate header arguments to results.
-rw-r--r--lisp/ob-lisp.el23
1 files changed, 14 insertions, 9 deletions
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 2fe0442..17cec24 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -63,15 +63,20 @@
(defun org-babel-execute:lisp (body params)
"Execute a block of Common Lisp code with Babel."
(require 'slime)
- (with-temp-buffer
- (insert (org-babel-expand-body:lisp body params))
- ((lambda (result)
- (if (member "output" (cdr (assoc :result-params params)))
- (car result)
- (condition-case nil (read (cadr result)) (error (cadr result)))))
- (slime-eval `(swank:eval-and-grab-output
- ,(buffer-substring-no-properties (point-min) (point-max)))
- (cdr (assoc :package params))))))
+ (org-babel-reassemble-table
+ (with-temp-buffer
+ (insert (org-babel-expand-body:lisp body params))
+ ((lambda (result)
+ (if (member "output" (cdr (assoc :result-params params)))
+ (car result)
+ (condition-case nil (read (cadr result)) (error (cadr result)))))
+ (slime-eval `(swank:eval-and-grab-output
+ ,(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))
+ (cdr (assoc :rownames params)))))
(provide 'ob-lisp)