From 27c2ac29ebed61e0e6a9c0c1863047ae74fa20ca Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sat, 5 Jun 2010 15:17:51 -0700 Subject: [PATCH] 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