Merge git://factorcode.org/git/erg

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
 

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

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
+USING: io.files io.launcher kernel namespaces math
-editors ;
+math.parser editors sequences windows.shell32 ;
 IN: editors.scite
 
-SYMBOL: scite-path
+: scite-path ( -- path )
-
+    \ scite-path get-global [
-"scite" scite-path set-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 ;

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 ;
 
 

extra/hardware-info/backend/backend.factor

@@ -11,4 +11,3 @@ HOOK: available-page-file os ( -- n )
 HOOK: total-virtual-mem os ( -- n )
 HOOK: available-virtual-mem os ( -- n )
 HOOK: available-virtual-extended-mem os ( -- n )
-

extra/hardware-info/windows/backend/backend.factor

@@ -0,0 +1,6 @@
+IN: hardware-info.windows.backend
+
+TUPLE: wince ;
+TUPLE: winnt ;
+UNION: windows wince winnt ;
+

extra/hardware-info/windows/nt/nt.factor

@@ -1,4 +1,4 @@
-USING: alien alien.c-types hardware-info hardware-info.windows
+USING: alien alien.c-types hardware-info.windows.backend
 kernel libc math namespaces hardware-info.backend
 windows windows.advapi32 windows.kernel32 ;
 IN: hardware-info.windows.nt

extra/hardware-info/windows/windows.factor

@@ -1,11 +1,9 @@
 USING: alien alien.c-types kernel libc math namespaces
 windows windows.kernel32 windows.advapi32
+hardware-info.windows.backend
 words combinators vocabs.loader hardware-info.backend ;
 IN: hardware-info.windows
 
-TUPLE: wince ;
-TUPLE: winnt ;
-UNION: windows wince winnt ;
 USE: system
 
 : system-info ( -- SYSTEM_INFO )

extra/help/tutorial/tutorial.factor

@@ -23,7 +23,7 @@ $nl
 $nl
 "Now, we tell Factor that all definitions in this source file should go into the " { $snippet "palindrome" } " vocabulary using the " { $link POSTPONE: IN: } " word:"
 { $code "IN: palindrome" }
-"You are now ready to go onto the nex section." ;
+"You are now ready to go on to the next section." ;
 
 ARTICLE: "first-program-logic" "Writing some logic in your first program"
 "Your " { $snippet "palindrome.factor" } " file should look like the following after the previous section:"

extra/io/windows/launcher/launcher.factor

@@ -51,7 +51,7 @@ TUPLE: CreateProcess-args
     [ [ dup CHAR: " = [ CHAR: \\ , ] when , ] each ] "" make ;
 
 : join-arguments ( args -- cmd-line )
-    [ "\"" swap escape-argument "\"" 3append ] map " " join ;
+    " " join ;
 
 : app-name/cmd-line ( -- app-name cmd-line )
     +command+ get [