From 229576feece1e36d301131eb9e4e64458bc1bac5 Mon Sep 17 00:00:00 2001
From: Doug Coleman <erg@jjjj.local>
Date: Sun, 13 Jan 2008 07:58:29 -1000
Subject: [PATCH] fix vim and gvim

---
 extra/editors/gvim/backend/backend.factor | 4 ++++
 extra/editors/gvim/gvim.factor            | 7 ++-----
 extra/editors/gvim/unix/unix.factor       | 2 +-
 extra/editors/vim/vim-docs.factor         | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 extra/editors/gvim/backend/backend.factor

diff --git a/extra/editors/gvim/backend/backend.factor b/extra/editors/gvim/backend/backend.factor
new file mode 100644
index 0000000000..e2e2f0626e
--- /dev/null
+++ b/extra/editors/gvim/backend/backend.factor
@@ -0,0 +1,4 @@
+USING: io.backend ;
+IN: editors.gvim.backend
+
+HOOK: gvim-path io-backend ( -- path )
diff --git a/extra/editors/gvim/gvim.factor b/extra/editors/gvim/gvim.factor
index 8b3573d03e..775d008963 100755
--- a/extra/editors/gvim/gvim.factor
+++ b/extra/editors/gvim/gvim.factor
@@ -1,13 +1,10 @@
 USING: io.backend io.files kernel math math.parser
-namespaces editors.vim sequences system combinators
-vocabs.loader ;
+namespaces sequences system combinators
+editors.vim editors.gvim.backend vocabs.loader ;
 IN: editors.gvim
 
 TUPLE: gvim ;
 
-HOOK: gvim-path io-backend ( -- path )
-
-
 M: gvim vim-command ( file line -- string )
     [ "\"" % gvim-path % "\" \"" % swap % "\" +" % # ] "" make ;
 
diff --git a/extra/editors/gvim/unix/unix.factor b/extra/editors/gvim/unix/unix.factor
index fd295cc9e9..a7de09c013 100644
--- a/extra/editors/gvim/unix/unix.factor
+++ b/extra/editors/gvim/unix/unix.factor
@@ -1,4 +1,4 @@
-USING: editors.gvim io.unix.backend kernel namespaces ;
+USING: io.unix.backend kernel namespaces editors.gvim.backend ;
 IN: editors.gvim.unix
 
 M: unix-io gvim-path
diff --git a/extra/editors/vim/vim-docs.factor b/extra/editors/vim/vim-docs.factor
index 9f141f524f..2e2583cc7f 100644
--- a/extra/editors/vim/vim-docs.factor
+++ b/extra/editors/vim/vim-docs.factor
@@ -1,5 +1,6 @@
-USING: definitions editors.vim help help.markup help.syntax io io.files
+USING: definitions help help.markup help.syntax io io.files
 editors words ;
+IN: editors.vim
 
 ARTICLE: { "vim" "vim" } "Vim support"
 "This module makes the " { $link edit } " word work with Vim by setting the " { $link edit-hook } " global variable to call " { $link vim-location } ". The " { $link vim-path } " variable contains the name of the vim executable.  The default " { $link vim-path } " is " { $snippet "\"gvim\"" } "."