From 84790f87f67230b339b8568ee40656a10f22dba8 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 19 Aug 2011 15:03:45 -0700
Subject: [PATCH] Change fuel.remote to use tty-server.

---
 extra/fuel/remote/remote.factor    | 18 +++++-------------
 extra/tty-server/tty-server.factor | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/extra/fuel/remote/remote.factor b/extra/fuel/remote/remote.factor
index e7b797fc19..b643614226 100644
--- a/extra/fuel/remote/remote.factor
+++ b/extra/fuel/remote/remote.factor
@@ -1,21 +1,13 @@
 ! Copyright (C) 2009, 2010 Jose Antonio Ortega Ruiz.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors debugger io io.encodings.utf8 io.servers
-kernel listener math namespaces ;
+
+USING: accessors io io.encodings.utf8 io.servers kernel math
+namespaces tty-server ;
+
 IN: fuel.remote
 
 <PRIVATE
 
-: start-listener ( -- )
-    [ [ drop print-error-and-restarts ] error-hook set listener ] with-scope ;
-
-: server ( port -- server )
-    utf8 <threaded-server>
-        "tty-server" >>name
-        swap local-server >>insecure
-        [ start-listener ] >>handler
-        f >>timeout ;
-
 : print-banner ( -- )
     "Starting server. Connect with 'M-x connect-to-factor' in Emacs"
     write nl flush ;
@@ -23,7 +15,7 @@ IN: fuel.remote
 PRIVATE>
 
 : fuel-start-remote-listener ( port/f -- )
-    print-banner integer? [ 9000 ] unless* server start-server drop ;
+    print-banner integer? [ 9000 ] unless* <tty-server> start-server drop ;
 
 : fuel-start-remote-listener* ( -- ) f fuel-start-remote-listener ;
 
diff --git a/extra/tty-server/tty-server.factor b/extra/tty-server/tty-server.factor
index 438faa0dec..6fef3b9ef4 100644
--- a/extra/tty-server/tty-server.factor
+++ b/extra/tty-server/tty-server.factor
@@ -1,13 +1,19 @@
-USING: listener io.servers io.encodings.utf8 accessors kernel ;
+USING: accessors debugger kernel listener io.servers
+io.encodings.utf8 namespaces ;
+
 IN: tty-server
 
-: <tty-server> ( port -- )
+: start-listener ( -- )
+    [ [ drop print-error-and-restarts ] error-hook set listener ] with-scope ;
+
+: <tty-server> ( port -- server )
     utf8 <threaded-server>
         "tty-server" >>name
         swap local-server >>insecure
-        [ listener ] >>handler
-    start-server drop ;
+        [ start-listener ] >>handler
+        f >>timeout ;
 
-: tty-server ( -- ) 9999 <tty-server> ;
+: run-tty-server ( -- )
+    9999 <tty-server> start-server drop ;
 
-MAIN: tty-server
+MAIN: run-tty-server