xmode: cleanup using.

diff --git a/basis/xmode/catalog/catalog.factor b/basis/xmode/catalog/catalog.factor
index 9ec8b65abae3926e25a28a816f80fbf93a0b8173..67faefff33356f1b76d360efc855bd9a5e3ee647 100644 (file)
--- a/basis/xmode/catalog/catalog.factor
+++ b/basis/xmode/catalog/catalog.factor
@@ -1,8 +1,7 @@
-USING: xmode.loader xmode.utilities xmode.rules namespaces
-strings splitting assocs sequences kernel io.files xml memoize
-words globs combinators io.encodings.utf8 io.pathnames sorting
-accessors regexp unicode.case xml.data xml.traversal
-xml.syntax ;
+USING: accessors assocs globs io.pathnames kernel memoize
+namespaces regexp sequences sorting splitting strings
+unicode.case xml xml.data xml.syntax xml.traversal xmode.loader
+xmode.rules xmode.utilities ;
 IN: xmode.catalog
 
 TUPLE: mode file file-name-glob first-line-glob ;

diff --git a/basis/xmode/loader/loader.factor b/basis/xmode/loader/loader.factor
index 43fe47a650643b4229cdc2a683540c6ef2c4d75f..12e992824f107f1a381ac6cde035c6b8e9bbec6a 100644 (file)
--- a/basis/xmode/loader/loader.factor
+++ b/basis/xmode/loader/loader.factor
@@ -1,7 +1,6 @@
-USING: xmode.loader.syntax xmode.tokens xmode.rules
-xmode.keyword-map xml.data xml.traversal xml assocs kernel
-combinators sequences math.parser namespaces parser
-xmode.utilities regexp io.files accessors xml.syntax ;
+USING: accessors assocs kernel math.parser namespaces sequences
+xml xml.data xml.syntax xml.traversal xmode.keyword-map
+xmode.loader.syntax xmode.rules xmode.tokens xmode.utilities ;
 IN: xmode.loader
 
 ! Based on org.gjt.sp.jedit.XModeHandler

diff --git a/basis/xmode/loader/syntax/syntax.factor b/basis/xmode/loader/syntax/syntax.factor
index 170348e10001463859f31d4873d77ba0bc8a6f35..21cc57077db3650db635be191afe57547e2c327d 100644 (file)
--- a/basis/xmode/loader/syntax/syntax.factor
+++ b/basis/xmode/loader/syntax/syntax.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2007, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors xmode.tokens xmode.rules xmode.keyword-map
-xml.data xml.traversal xml assocs kernel combinators sequences
-math.parser namespaces make parser lexer xmode.utilities
-regexp io.files splitting arrays xml.syntax xml.syntax.private ;
+USING: accessors arrays assocs combinators kernel lexer make
+namespaces parser sequences splitting xml.data xml.syntax
+xml.syntax.private xml.traversal xmode.rules xmode.tokens
+xmode.utilities ;
 IN: xmode.loader.syntax
 
 ! Rule tag parsing utilities

diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor
index 91d1ffaac4f49527424b3d32a3f0bd4dcc061611..3276e6594fba4faa101a0e2a66a1b26d3a670ba5 100644 (file)
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces make xmode.rules xmode.tokens
-xmode.marker.state xmode.marker.context xmode.utilities
-xmode.catalog sequences math assocs combinators strings
-regexp splitting ascii combinators.short-circuit accessors ;
+USING: accessors ascii assocs combinators
+combinators.short-circuit kernel make math namespaces regexp
+sequences strings xmode.marker.state xmode.rules xmode.tokens
+xmode.utilities ;
 IN: xmode.marker
 
 ! Next two words copied from parser-combinators
@@ -245,7 +245,7 @@ M: mark-previous-rule handle-rule-start
 
 : (check-word-break) ( -- )
     check-rule
-    
+
     1 current-rule-set default>> next-token, ;
 
 : rule-set-empty? ( ruleset -- ? )