Fix load errors related to utf16n being moved to io.encodings.utf16n

diff --git a/basis/tools/deploy/unix/unix.factor b/basis/tools/deploy/unix/unix.factor
index 5e1d0be7fb5a9471b6112422b134f9069c0810cd..bd49155e8442f4d7d48f33aeae815a54e0d06647 100644 (file)
--- a/basis/tools/deploy/unix/unix.factor
+++ b/basis/tools/deploy/unix/unix.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 James Cash
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io io.files io.backend kernel namespaces make sequences
-system tools.deploy.backend tools.deploy.config assocs
-hashtables prettyprint ;
+system tools.deploy.backend tools.deploy.config
+tools.deploy.config.editor assocs hashtables prettyprint ;
 IN: tools.deploy.unix
 
 : create-app-dir ( vocab bundle-name -- vm )

diff --git a/basis/tools/deploy/windows/windows.factor b/basis/tools/deploy/windows/windows.factor
index ec1259c777775ad54d2c0d81d42291b782e5ecac..6188e78b0eb37e410c58841fa6d7b6a806044523 100755 (executable)
--- a/basis/tools/deploy/windows/windows.factor
+++ b/basis/tools/deploy/windows/windows.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io io.files kernel namespaces sequences system
-tools.deploy.backend tools.deploy.config assocs hashtables
-prettyprint combinators windows.shell32 windows.user32 ;
+tools.deploy.backend tools.deploy.config
+tools.deploy.config.editor assocs hashtables prettyprint
+combinators windows.shell32 windows.user32 ;
 IN: tools.deploy.windows
 
 : copy-dll ( bundle-name -- )

diff --git a/basis/windows/shell32/shell32.factor b/basis/windows/shell32/shell32.factor
index b071bee72a4898c8b452e4e6ae0c627974c49e78..eae796ac0876e3fe769c47e5c5ddffddc0758c21 100644 (file)
--- a/basis/windows/shell32/shell32.factor
+++ b/basis/windows/shell32/shell32.factor
@@ -1,6 +1,6 @@
 USING: alien alien.c-types alien.strings alien.syntax combinators
 kernel windows windows.user32 windows.ole32
-windows.com windows.com.syntax io.files ;
+windows.com windows.com.syntax io.files io.encodings.utf16n ;
 IN: windows.shell32
 
 : CSIDL_DESKTOP HEX: 00 ; inline

diff --git a/basis/windows/windows.factor b/basis/windows/windows.factor
index 2fc1dbf12207a86d857c20c27046d94a93f01b62..d2250d6f7e06024ad0135600fa08657565b4d597 100644 (file)
--- a/basis/windows/windows.factor
+++ b/basis/windows/windows.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.c-types alien.strings arrays
 combinators kernel math namespaces parser prettyprint sequences
-windows.errors windows.types windows.kernel32 words ;
+windows.errors windows.types windows.kernel32 words
+io.encodings.utf16n ;
 IN: windows
 
 : lo-word ( wparam -- lo ) <short> *short ; inline