From 271672fad74cdbc9065d23d6e6cee1b8540f571b Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@gnu.org>
Date: Tue, 12 Nov 2013 14:06:26 +0100
Subject: Merge Org version 8.2.3a.

---
 lisp/org/ob-lisp.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lisp/org/ob-lisp.el')

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)))))
-- 
cgit v1.2.1