From 425be6a414306d6f6b1bb95ce3ae2cd40995c2ac Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Sun, 19 Apr 2009 20:35:54 +0200
Subject: [PATCH] FUEL: modify directly use/in to set up evaluation context

---
 extra/fuel/eval/eval.factor  | 8 ++++----
 misc/fuel/fuel-connection.el | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extra/fuel/eval/eval.factor b/extra/fuel/eval/eval.factor
index ae1c5863a8..26d3999380 100644
--- a/extra/fuel/eval/eval.factor
+++ b/extra/fuel/eval/eval.factor
@@ -63,13 +63,13 @@ t fuel-eval-res-flag set-global
     [ (fuel-eval) ] each ;
 
 : (fuel-eval-usings) ( usings -- )
-    [ "USE: " prepend ] map
-    (fuel-eval-each) fuel-forget-error fuel-forget-output ;
+    [ [ use+ ] curry [ drop ] recover ] each
+    fuel-forget-error fuel-forget-output ;
 
 : (fuel-eval-in) ( in -- )
-    [ dup "IN: " prepend (fuel-eval) in set ] when* ;
+    [ in set ] when* ;
 
 : (fuel-eval-in-context) ( lines in usings -- )
     (fuel-begin-eval)
-    [ (fuel-eval-usings) (fuel-eval-in) "\n" join (fuel-eval) ] with-string-writer
+    [ (fuel-eval-usings) (fuel-eval-in) (fuel-eval) ] with-string-writer
     (fuel-end-eval) ;
diff --git a/misc/fuel/fuel-connection.el b/misc/fuel/fuel-connection.el
index f180d0f2b4..ef39b7af65 100644
--- a/misc/fuel/fuel-connection.el
+++ b/misc/fuel/fuel-connection.el
@@ -164,7 +164,7 @@
     (fuel-con--send-string/wait buffer
                                 fuel-con--init-stanza
                                 'fuel-con--establish-connection-cont
-                                60000)
+                                3000000)
     conn))
 
 (defun fuel-con--establish-connection-cont (ignore)