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-lisp.el | |
| parent | f201cf3a8143b0b34b07769fc7d73dd14761b87b (diff) | |
| download | emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.tar.gz | |
Merge Org version 8.2.3a.
Diffstat (limited to 'lisp/org/ob-lisp.el')
| -rw-r--r-- | lisp/org/ob-lisp.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el index 4ff9718553b..2bb1a25bfb8 100644 --- a/lisp/org/ob-lisp.el +++ b/lisp/org/ob-lisp.el @@ -76,8 +76,8 @@ current directory string." (require 'slime) (org-babel-reassemble-table ((lambda (result) - (if (member "output" (cdr (assoc :result-params params))) - (car result) + (org-babel-result-cond (cdr (assoc :result-params params)) + (car result) (condition-case nil (read (org-babel-lisp-vector-to-list (cadr result))) (error (cadr result))))) |