Merge branch 'master' into new_ui

diff --cc basis/help/markup/markup.factor
Simple merge

diff --cc basis/prettyprint/prettyprint.factor
Simple merge

diff --cc basis/tools/vocabs/browser/browser.factor
Simple merge

diff --cc basis/ui/tools/interactor/interactor.factor
Simple merge

diff --cc basis/ui/tools/search/search.factor
index 89a5ccea84c222f519a99020404e014eca47ae9a,9d248e29bdb9ceae5ceef453d41d6cd536dba056..a8f70cf76d003300063d709dc604b7518f07c8d1
--- 1/basis/ui/tools/search/search.factor
--- 2/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 ;

diff --cc core/parser/parser.factor
Simple merge