From 8cb274e9f91a32f9ffcda44c6b351bbb08a5e958 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 29 Jan 2008 11:41:12 -0600
Subject: [PATCH] fix editors for windows

---
 extra/editors/gvim/windows/windows.factor |  2 +-
 extra/editors/notepadpp/notepadpp.factor  |  4 ++--
 extra/editors/scite/scite.factor          | 13 +++++++------
 extra/editors/ultraedit/ultraedit.factor  |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/extra/editors/gvim/windows/windows.factor b/extra/editors/gvim/windows/windows.factor
index 5a3ea6b67a..5b51738eea 100644
--- a/extra/editors/gvim/windows/windows.factor
+++ b/extra/editors/gvim/windows/windows.factor
@@ -1,4 +1,4 @@
-USING: editors.gvim io.files io.windows kernel namespaces
+USING: editors.gvim.backend io.files io.windows kernel namespaces
 sequences windows.shell32 ;
 IN: editors.gvim.windows
 
diff --git a/extra/editors/notepadpp/notepadpp.factor b/extra/editors/notepadpp/notepadpp.factor
index f9fa95f175..72ac6c72d7 100755
--- a/extra/editors/notepadpp/notepadpp.factor
+++ b/extra/editors/notepadpp/notepadpp.factor
@@ -1,5 +1,5 @@
 USING: editors io.files io.launcher kernel math.parser
-namespaces windows.shell32 ;
+namespaces sequences windows.shell32 ;
 IN: editors.notepadpp
 
 : notepadpp-path
@@ -11,6 +11,6 @@ IN: editors.notepadpp
     [
         notepadpp-path ,
         "-n" swap number>string append , ,
-    ] "" make run-detached drop ;
+    ] { } make run-detached drop ;
 
 [ notepadpp ] edit-hook set-global
diff --git a/extra/editors/scite/scite.factor b/extra/editors/scite/scite.factor
index bc9a98a051..ac9a032abc 100755
--- a/extra/editors/scite/scite.factor
+++ b/extra/editors/scite/scite.factor
@@ -8,18 +8,19 @@
 ! variable to point to your executable,
 ! if not on the path.
 !
-USING: io.launcher kernel namespaces math math.parser
-editors ;
+USING: io.files io.launcher kernel namespaces math
+math.parser editors sequences windows.shell32 ;
 IN: editors.scite
 
-SYMBOL: scite-path
-
-"scite" scite-path set-global
+: scite-path ( -- path )
+    \ scite-path get-global [
+        program-files "wscite\\SciTE.exe" path+
+    ] unless* ;
 
 : scite-command ( file line -- cmd )
   swap
   [
-    scite-path get ,
+    scite-path ,
     ,
     "-goto:" swap number>string append ,
   ] { } make ;
diff --git a/extra/editors/ultraedit/ultraedit.factor b/extra/editors/ultraedit/ultraedit.factor
index 7da4b807ce..f9d27174b3 100755
--- a/extra/editors/ultraedit/ultraedit.factor
+++ b/extra/editors/ultraedit/ultraedit.factor
@@ -10,7 +10,7 @@ IN: editors.ultraedit
 
 : ultraedit ( file line -- )
     [
-        ultraedit-path , [ % "/" % # "/1" % ] "" make ,
+        ultraedit-path , [ swap % "/" % # "/1" % ] "" make ,
     ] { } make run-detached drop ;