From df9c48c58645e22bde9eed341f56e11f15a7fc1e Mon Sep 17 00:00:00 2001
From: Doug Coleman <erg@jobim.local>
Date: Fri, 17 Apr 2009 23:24:41 -0500
Subject: [PATCH 1/3] dont allow tests of help scaffolding unless the
 vocabulary exists

---
 basis/tools/scaffold/scaffold.factor | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index 73e896d5ff..d02faae3a8 100755
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -24,6 +24,9 @@ ERROR: no-vocab vocab ;
 
 : contains-separator? ( string -- ? ) [ path-separator? ] any? ;
 
+: ensure-vocab-exists ( string -- string )
+    dup vocabs member? [ no-vocab ] unless ;
+
 : check-vocab-name ( string -- string )
     [ ]
     [ contains-dot? [ vocab-name-contains-dot ] when ]
@@ -234,6 +237,7 @@ PRIVATE>
     [ (help.) ] [ nl vocabulary>> link-vocab ] bi ;
 
 : scaffold-help ( vocab -- )
+    ensure-vocab-exists
     [
         dup "-docs.factor" vocab/suffix>path scaffolding? [
             set-scaffold-docs-file
@@ -268,6 +272,7 @@ PRIVATE>
 PRIVATE>
 
 : scaffold-tests ( vocab -- )
+    ensure-vocab-exists
     dup "-tests.factor" vocab/suffix>path
     scaffolding? [
         set-scaffold-tests-file

From d3e24a7b7ee48f5c6aef06b5c125e42fc09fd0bd Mon Sep 17 00:00:00 2001
From: erg <erg@ubuntubox.(none)>
Date: Sat, 18 Apr 2009 01:43:40 -0500
Subject: [PATCH 2/3] add editors.gedit

---
 basis/editors/gedit/authors.txt  |  1 +
 basis/editors/gedit/gedit.factor | 17 +++++++++++++++++
 basis/editors/gedit/summary.txt  |  1 +
 basis/editors/gedit/tags.txt     |  1 +
 4 files changed, 20 insertions(+)
 create mode 100644 basis/editors/gedit/authors.txt
 create mode 100644 basis/editors/gedit/gedit.factor
 create mode 100644 basis/editors/gedit/summary.txt
 create mode 100644 basis/editors/gedit/tags.txt

diff --git a/basis/editors/gedit/authors.txt b/basis/editors/gedit/authors.txt
new file mode 100644
index 0000000000..7c1b2f2279
--- /dev/null
+++ b/basis/editors/gedit/authors.txt
@@ -0,0 +1 @@
+Doug Coleman
diff --git a/basis/editors/gedit/gedit.factor b/basis/editors/gedit/gedit.factor
new file mode 100644
index 0000000000..97ea0e1cb3
--- /dev/null
+++ b/basis/editors/gedit/gedit.factor
@@ -0,0 +1,17 @@
+! Copyright (C) 2008 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
+USING: editors io.launcher kernel make math.parser namespaces
+sequences ;
+IN: editors.gedit
+
+: gedit-path ( -- path )
+    \ gedit-path get-global [
+        "gedit"
+    ] unless* ;
+
+: gedit ( file line -- )
+    [
+        gedit-path , number>string "+" prepend , ,
+    ] { } make run-detached drop ;
+
+[ gedit ] edit-hook set-global
diff --git a/basis/editors/gedit/summary.txt b/basis/editors/gedit/summary.txt
new file mode 100644
index 0000000000..ebb7189c9f
--- /dev/null
+++ b/basis/editors/gedit/summary.txt
@@ -0,0 +1 @@
+gedit integration
diff --git a/basis/editors/gedit/tags.txt b/basis/editors/gedit/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/gedit/tags.txt
@@ -0,0 +1 @@
+unportable

From b5acfdcd6495f9b54a039c9ab35d54ed8c73c6a5 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 18 Apr 2009 03:04:03 -0500
Subject: [PATCH 3/3] mason: fix some bugs

---
 extra/mason/build/build-tests.factor | 3 ---
 extra/mason/email/email-tests.factor | 3 +--
 extra/mason/report/report.factor     | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/extra/mason/build/build-tests.factor b/extra/mason/build/build-tests.factor
index 1e3705629f..4f5825e4dd 100644
--- a/extra/mason/build/build-tests.factor
+++ b/extra/mason/build/build-tests.factor
@@ -1,5 +1,2 @@
 USING: mason.build tools.test sequences ;
 IN: mason.build.tests
-
-{ create-build-dir enter-build-dir clone-builds-factor record-id }
-[ must-infer ] each
diff --git a/extra/mason/email/email-tests.factor b/extra/mason/email/email-tests.factor
index 5bde9a9cfe..e2afe01a56 100644
--- a/extra/mason/email/email-tests.factor
+++ b/extra/mason/email/email-tests.factor
@@ -5,7 +5,6 @@ USING: mason.email mason.common mason.config namespaces tools.test ;
     [
         "linux" target-os set
         "x86.64" target-cpu set
-        status-error status set
-        subject prefix-subject
+        status-error subject prefix-subject
     ] with-scope
 ] unit-test
diff --git a/extra/mason/report/report.factor b/extra/mason/report/report.factor
index d6732adb1d..0839652d55 100644
--- a/extra/mason/report/report.factor
+++ b/extra/mason/report/report.factor
@@ -63,6 +63,7 @@ IN: mason.report
         benchmark-time-file
         html-help-time-file
     } [
+        execute( -- string )
         dup utf8 file-contents milli-seconds>time
         [XML <tr><td><-></td><td><-></td></tr> XML]
     ] map [XML <h2>Timings</h2> <table><-></table> XML] ;