Merge branch 'emacs' of http://git.hacks-galore.org/jao/factor

diff --combined extra/fuel/xref/xref.factor
index cfd036e6258c4c812d65c21e5562a11bb403ddf0,2eca55d1565ecaced1679b932e02db9d61dc72f6..c228901afbefea40326aa38cc2e6e1c08b776f9b
--- 1/extra/fuel/xref/xref.factor
--- 2/extra/fuel/xref/xref.factor
+++ b/extra/fuel/xref/xref.factor
@@@ -23,7 -23,7 +23,7 @@@ IN: fuel.xre
      dup dup >vocab-link where normalize-loc 4array ;
  
  : sort-xrefs ( seq -- seq' )
 -    [ [ first ] dip first <=> ] sort ;
 +    [ first ] sort-with ;
  
  : format-xrefs ( seq -- seq' )
      [ word? ] filter [ word>xref ] map ;
@@@ -36,8 -36,8 +36,8 @@@ MEMO: (vocab-words) ( name -- seq 
  
  : current-words ( -- seq )
      manifest get
-     [ search-vocabs>> ] [ qualified-vocabs>> ] bi [ words>> ] bi@
-     assoc-union keys ;
+     [ search-vocabs>> ] [ qualified-vocabs>> ] bi [ [ words>> ] map ] bi@
+     append H{ } [ assoc-union ] reduce keys ;
  
  : vocabs-words ( names -- seq )
      prune [ (vocab-words) ] map concat ;