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

Conflicts:
	unmaintained/modules/rpc-server/rpc-server.factor

diff --combined core/vocabs/parser/parser.factor
index 5305b42809ccdf59a053d93c9ab487001ac553c8,0bfb607a52f67c33a95374405b96851684e35ac3..98b8b8d0e89eb639e4b366274302466e2686f353
--- 1/core/vocabs/parser/parser.factor
--- 2/core/vocabs/parser/parser.factor
+++ b/core/vocabs/parser/parser.factor
@@@ -6,7 -6,7 +6,7 @@@ sets strings vocabs sorting accessors a
  combinators vectors splitting continuations math
  parser.notes ;
  IN: vocabs.parser
 -
 + 
  ERROR: no-word-error name ;
  
  : word-restarts ( possibilities -- restarts )
@@@ -17,7 -17,7 +17,7 @@@
      word-restarts
      swap "Defer word in current vocabulary" swap 2array
      suffix ;
 -
 + 
  : <no-word-error> ( name possibilities -- error restarts )
      [ drop \ no-word-error boa ] [ word-restarts-with-defer ] 2bi ;
  
@@@ -52,8 -52,6 +52,6 @@@ M: extra-words equal
  
  C: <extra-words> extra-words
  
- <PRIVATE
- 
  : clear-manifest ( -- )
      manifest get
      [ search-vocab-names>> clear-assoc ]
@@@ -61,6 -59,8 +59,8 @@@
      [ qualified-vocabs>> delete-all ]
      tri ;
  
+ <PRIVATE
+ 
  : (add-qualified) ( qualified -- )
      manifest get qualified-vocabs>> push ;
  
@@@ -126,9 -126,6 +126,6 @@@ TUPLE: no-current-vocab 
          2bi
      ] [ drop ] if ;
  
- : only-use-vocabs ( vocabs -- )
-     clear-manifest [ vocab ] filter [ use-vocab ] each ;
- 
  TUPLE: qualified vocab prefix words ;
  
  : <qualified> ( vocab prefix -- qualified )
@@@ -201,4 -198,4 +198,4 @@@ PRIVATE
      2dup qualified-search dup [ 2nip ] [ drop vocab-search ] if ;
  
  : search ( name -- word/f )
 -    manifest get search-manifest ;
 +    manifest get search-manifest ;