FUEL: conflict resolution

diff --git a/extra/fuel/eval/eval.factor b/extra/fuel/eval/eval.factor
index 019b9105bccffeda453321890b08e416fbfdf9bc..3f7ce863c7023dee38a455ff0be2486c078d9b4c 100644 (file)
--- a/extra/fuel/eval/eval.factor
+++ b/extra/fuel/eval/eval.factor
@@ -60,11 +60,11 @@ t fuel-eval-res-flag set-global
     [ print-error ] recover ;
 
 : (fuel-eval-usings) ( usings -- )
-    [ "USE: " prepend ] map
-    (fuel-eval) fuel-forget-error fuel-forget-output ;
+    [ [ use+ ] curry [ drop ] recover ] each
+    fuel-forget-error fuel-forget-output ;
 
 : (fuel-eval-in) ( in -- )
-    [ dup "IN: " prepend 1array (fuel-eval) in set ] when* ;
+    [ in set ] when* ;
 
 : (fuel-eval-in-context) ( lines in usings -- )
     (fuel-begin-eval)

diff --git a/misc/fuel/fuel-connection.el b/misc/fuel/fuel-connection.el
index f180d0f2b430beff7890475c69ff0159a51bb530..ef39b7af659b559343dd9f06d039a4b1e1520813 100644 (file)
--- 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)