Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/basis/io/directories/search/search-tests.factor b/basis/io/directories/search/search-tests.factor
index ba1b9cdbe11c1c0bf21d76d26bc529d0eee52b5d..5281ca9c2b4440d500c0f56d62262c0ae1e4e449 100644 (file)
--- a/basis/io/directories/search/search-tests.factor
+++ b/basis/io/directories/search/search-tests.factor
@@ -8,3 +8,13 @@ IN: io.directories.search.tests
         current-temporary-directory get [ ] find-all-files
     ] with-unique-directory drop [ natural-sort ] bi@ =
 ] unit-test
+
+[ f ] [
+    { "omg you shoudnt have a directory called this" "or this" }
+    t
+    [ "asdfasdfasdfasdfasdf" tail? ] find-in-directories
+] unit-test
+
+[ f ] [
+    { } t [ "asdfasdfasdfasdfasdf" tail? ] find-in-directories
+] unit-test

diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor
index ee8fd129a7313239ce0982d62a89777037b5d6d4..a3db10ffff5caf48104a77f90f2183c53de80ca7 100755 (executable)
--- a/basis/io/directories/search/search.factor
+++ b/basis/io/directories/search/search.factor
@@ -61,8 +61,8 @@ PRIVATE>
 ERROR: file-not-found ;
 
 : find-in-directories ( directories bfs? quot: ( obj -- ? ) -- path'/f )
-    [
-        '[ _ _ find-file [ file-not-found ] unless* ] attempt-all
+    '[
+        _ [ _ _ find-file [ file-not-found ] unless* ] attempt-all
     ] [
         drop f
     ] recover ;