From 5c7e28a1bca5bc46c8cfac484662db6744ae6b40 Mon Sep 17 00:00:00 2001
From: Eric Schulte <schulte.eric@gmail.com>
Date: Sun, 30 Jun 2013 18:04:43 -0600
Subject: [PATCH] Revert "use org-babel-result-cond in scheme code blocks"

This reverts commit 92e32755fd89f0fd7782f4537d9f26b7ee25cbda.
---
 lisp/ob-scheme.el | 48 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index 89dd00331..c9fa44a2f 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -72,31 +72,29 @@ This function is called by `org-babel-execute-src-block'"
   (let* ((result-type (cdr (assoc :result-type params)))
 	 (org-babel-scheme-cmd (or (cdr (assoc :scheme params))
 				   org-babel-scheme-cmd))
-         (full-body (org-babel-expand-body:scheme body params))
-	 (result (if (not (string= (cdr (assoc :session params)) "none"))
-		     ;; session evaluation
-		     (let ((session (org-babel-prep-session:scheme
-				     (cdr (assoc :session params)) params)))
-		       (org-babel-comint-with-output
-			   (session (format "%S" org-babel-scheme-eoe) t body)
-			 (mapc
-			  (lambda (line)
-			    (insert (org-babel-chomp line))
-			    (comint-send-input nil t))
-			  (list body (format "%S" org-babel-scheme-eoe)))))
-		   ;; external evaluation
-		   (let ((script-file (org-babel-temp-file "scheme-script-")))
-		     (with-temp-file script-file
-		       (insert
-			;; return the value or the output
-			(if (string= result-type "value")
-			    (format "(display %s)" full-body)
-			  full-body)))
-		     (org-babel-eval
-		      (format "%s %s" org-babel-scheme-cmd
-			      (org-babel-process-file-name script-file)) "")))))
-    (org-babel-result-cond (cdr (assoc :result-params params))
-      result (read result))))
+         (full-body (org-babel-expand-body:scheme body params)))
+    (read
+     (if (not (string= (cdr (assoc :session params)) "none"))
+         ;; session evaluation
+	 (let ((session (org-babel-prep-session:scheme
+			 (cdr (assoc :session params)) params)))
+	   (org-babel-comint-with-output
+	       (session (format "%S" org-babel-scheme-eoe) t body)
+	     (mapc
+	      (lambda (line)
+		(insert (org-babel-chomp line)) (comint-send-input nil t))
+	      (list body (format "%S" org-babel-scheme-eoe)))))
+       ;; external evaluation
+       (let ((script-file (org-babel-temp-file "scheme-script-")))
+         (with-temp-file script-file
+           (insert
+            ;; return the value or the output
+            (if (string= result-type "value")
+                (format "(display %s)" full-body)
+              full-body)))
+         (org-babel-eval
+	  (format "%s %s" org-babel-scheme-cmd
+		  (org-babel-process-file-name script-file)) ""))))))
 
 (defun org-babel-prep-session:scheme (session params)
   "Prepare SESSION according to the header arguments specified in PARAMS."
-- 
2.11.4.GIT