From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 18 Dec 2008 00:15:01 +0000 (-0600)
Subject: Merge branch 'master' into new_ui
X-Git-Tag: 0.94~2191^2~637^2
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=0643cf3a4403bc0f6090ccc3b3346d4a942c2973

Merge branch 'master' into new_ui
---

0643cf3a4403bc0f6090ccc3b3346d4a942c2973
diff --cc basis/ui/tools/search/search.factor
index 89a5ccea84,9d248e29bd..a8f70cf76d
--- a/basis/ui/tools/search/search.factor
+++ b/basis/ui/tools/search/search.factor
@@@ -1,14 -1,14 +1,14 @@@
  ! Copyright (C) 2006, 2008 Slava Pestov.
  ! See http://factorcode.org/license.txt for BSD license.
- USING: accessors assocs help help.topics io.files io.styles
+ USING: accessors assocs help help.topics io.pathnames io.styles
  kernel models models.delay models.filter namespaces prettyprint
  quotations sequences sorting source-files definitions strings
 -tools.completion tools.crossref classes.tuple vocabs words
 -vocabs.loader tools.vocabs unicode.case calendar locals
 -ui.tools.interactor ui.tools.listener ui.tools.workspace
 -ui.commands ui.gadgets ui.gadgets.editors ui.gadgets.lists
 -ui.gadgets.scrollers ui.gadgets.tracks ui.gadgets.borders
 -ui.gestures ui.operations ui ;
 +tools.completion tools.apropos tools.crossref classes.tuple
 +vocabs words vocabs.loader tools.vocabs unicode.case calendar
 +locals fry ui.tools.interactor ui.tools.listener
 +ui.tools.workspace ui.commands ui.gadgets ui.gadgets.editors
 +ui.gadgets.lists ui.gadgets.scrollers ui.gadgets.tracks
 +ui.gadgets.borders ui.gestures ui.operations ui ;
  IN: ui.tools.search
  
  TUPLE: live-search < track field list ;