From 374f8acae219eee04b376869644f64d58ca0a654 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 29 Jan 2008 11:40:50 -0600
Subject: [PATCH 1/4] fix hardware-info for windows
---
extra/hardware-info/backend/backend.factor | 1 -
extra/hardware-info/windows/backend/backend.factor | 6 ++++++
extra/hardware-info/windows/nt/nt.factor | 2 +-
extra/hardware-info/windows/windows.factor | 4 +---
4 files changed, 8 insertions(+), 5 deletions(-)
create mode 100644 extra/hardware-info/windows/backend/backend.factor
diff --git a/extra/hardware-info/backend/backend.factor b/extra/hardware-info/backend/backend.factor
index d79678de0c..17794c196d 100644
--- a/extra/hardware-info/backend/backend.factor
+++ b/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 )
-
diff --git a/extra/hardware-info/windows/backend/backend.factor b/extra/hardware-info/windows/backend/backend.factor
new file mode 100644
index 0000000000..516603c441
--- /dev/null
+++ b/extra/hardware-info/windows/backend/backend.factor
@@ -0,0 +1,6 @@
+IN: hardware-info.windows.backend
+
+TUPLE: wince ;
+TUPLE: winnt ;
+UNION: windows wince winnt ;
+
diff --git a/extra/hardware-info/windows/nt/nt.factor b/extra/hardware-info/windows/nt/nt.factor
index f412754cdf..8a58e5c168 100644
--- a/extra/hardware-info/windows/nt/nt.factor
+++ b/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
diff --git a/extra/hardware-info/windows/windows.factor b/extra/hardware-info/windows/windows.factor
index a49e4f254a..caf859c35e 100755
--- a/extra/hardware-info/windows/windows.factor
+++ b/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 )
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 2/4] 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 ;
From 5f3c77bb9bd5dfb5e0a477e27454f71d28438bc3 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 29 Jan 2008 11:41:50 -0600
Subject: [PATCH 3/4] fix typo
---
extra/help/tutorial/tutorial.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extra/help/tutorial/tutorial.factor b/extra/help/tutorial/tutorial.factor
index a4d5e36b06..b3308e83c2 100644
--- a/extra/help/tutorial/tutorial.factor
+++ b/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:"
From 44d058c676e768f179f89cfeb66661541202c301 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 29 Jan 2008 12:13:08 -0600
Subject: [PATCH 4/4] fix windows launcher code
---
extra/io/windows/launcher/launcher.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extra/io/windows/launcher/launcher.factor b/extra/io/windows/launcher/launcher.factor
index 7b793ef74d..8f1d1c6756 100755
--- a/extra/io/windows/launcher/launcher.factor
+++ b/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 [