From f5b4ecc14a33fd6b7c980fc4d87ca4ffc877adbc Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Sat, 5 Jun 2010 15:07:45 -0700
Subject: [PATCH 1/3] xmode.catalog: fix find-mode so it works with full paths

---
 basis/xmode/catalog/catalog.factor | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/basis/xmode/catalog/catalog.factor b/basis/xmode/catalog/catalog.factor
index e576a672c2..9b337418b3 100644
--- a/basis/xmode/catalog/catalog.factor
+++ b/basis/xmode/catalog/catalog.factor
@@ -1,7 +1,7 @@
 USING: xmode.loader xmode.utilities xmode.rules namespaces
 strings splitting assocs sequences kernel io.files xml memoize
-words globs combinators io.encodings.utf8 sorting accessors xml.data
-xml.traversal xml.syntax ;
+words globs combinators io.encodings.utf8 io.pathnames sorting
+accessors xml.data xml.traversal xml.syntax ;
 IN: xmode.catalog
 
 TUPLE: mode file file-name-glob first-line-glob ;
@@ -114,6 +114,7 @@ ERROR: mutually-recursive-rulesets ruleset ;
     [ 2drop t ] [ file-name-glob>> ?glob-matches ] if ;
 
 : find-mode ( file-name first-line -- mode )
+    [ file-name ] dip
     modes
     [ nip [ 2dup ] dip suitable-mode? ] assoc-find
     2drop [ 2drop ] dip [ "text" ] unless* ;

From 27c2ac29ebed61e0e6a9c0c1863047ae74fa20ca Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Sat, 5 Jun 2010 15:17:51 -0700
Subject: [PATCH 2/3] xmode.catalog: factor ?find-mode (which returns f if no
 mode found) from find-mode (which defaults to "text" if no mode found)

---
 basis/xmode/catalog/catalog.factor | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/basis/xmode/catalog/catalog.factor b/basis/xmode/catalog/catalog.factor
index 9b337418b3..6ca3013bf7 100644
--- a/basis/xmode/catalog/catalog.factor
+++ b/basis/xmode/catalog/catalog.factor
@@ -113,8 +113,11 @@ ERROR: mutually-recursive-rulesets ruleset ;
     [ nip ] 2keep first-line-glob>> ?glob-matches
     [ 2drop t ] [ file-name-glob>> ?glob-matches ] if ;
 
-: find-mode ( file-name first-line -- mode )
+: ?find-mode ( file-name first-line -- mode/f )
     [ file-name ] dip
     modes
     [ nip [ 2dup ] dip suitable-mode? ] assoc-find
-    2drop [ 2drop ] dip [ "text" ] unless* ;
+    2drop [ 2drop ] dip ;
+
+: find-mode ( file-name first-line -- mode )
+    ?find-mode "text" or ; inline

From bd0a27c18e844dca9b180a11020e05520dc347e2 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sat, 5 Jun 2010 18:54:34 -0500
Subject: [PATCH 3/3] Sets docs -- testing set membership: member? -> in?

---
 core/sets/sets-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/sets/sets-docs.factor b/core/sets/sets-docs.factor
index 5ae9641734..bf2b6904c3 100644
--- a/core/sets/sets-docs.factor
+++ b/core/sets/sets-docs.factor
@@ -15,7 +15,7 @@ ABOUT: "sets"
 
 ARTICLE: "set-operations" "Operations on sets"
 "To test if an object is a member of a set:"
-{ $subsections member? }
+{ $subsections in? }
 "All sets can be represented as a sequence, without duplicates, of their members:"
 { $subsections members }
 "Sets can have members added or removed destructively:"