Fix conflict

diff --combined extra/fuel/fuel.factor
index 58efe2d8ce3c85d1a977b302f2f670e547e6f0d6,017b20b54b6ff369caebb126ca1f92d7e4a1a652..11c70d5125f348223061da919e0024b5163c780b
--- 1/extra/fuel/fuel.factor
--- 2/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@@ -6,8 -6,8 +6,8 @@@ combinators compiler.units continuation
  eval help io io.files io.pathnames io.streams.string kernel
  lexer listener listener.private make math memoize namespaces
  parser prettyprint prettyprint.config quotations sequences sets
 -sorting source-files strings summary tools.vocabs vectors
 -vocabs vocabs.loader ;
 +sorting source-files strings tools.vocabs vectors vocabs
- vocabs.loader vocabs.parser ;
++vocabs.loader vocabs.parser summary ;
  
  IN: fuel
  
@@@ -160,6 -160,10 +160,10 @@@ M: source-file fuel-pprint path>> fuel-
  
  : fuel-end-eval ( -- ) [ ] (fuel-end-eval) ; inline
  
+ : fuel-run-file ( path -- ) run-file ; inline
+ 
+ ! Edit locations
+ 
  : fuel-get-edit-location ( defspec -- )
      where [
         first2 [ (normalize-path) ] dip 2array fuel-eval-set-result
@@@ -168,12 -172,23 +172,23 @@@
  : fuel-get-vocab-location ( vocab -- )
      >vocab-link fuel-get-edit-location ; inline
  
+ ! Completion support
+ 
+ : fuel-filter-prefix ( seq prefix -- seq )
+     [ drop-prefix nip length 0 = ] curry filter prune ; inline
+ 
  : (fuel-get-vocabs) ( -- seq )
      all-vocabs-seq [ vocab-name ] map ; inline
  
  : fuel-get-vocabs ( -- )
      (fuel-get-vocabs) fuel-eval-set-result ; inline
  
+ : fuel-get-vocabs/prefix ( prefix -- )
+     (fuel-get-vocabs) swap fuel-filter-prefix fuel-eval-set-result ; inline
+ 
+ : fuel-vocab-summary ( name -- )
+     >vocab-link summary fuel-eval-set-result ; inline
+ 
  MEMO: (fuel-vocab-words) ( name -- seq )
      >vocab-link words [ name>> ] map ;
  
@@@ -185,12 -200,13 +200,13 @@@
  
  : (fuel-get-words) ( prefix names/f -- seq )
      [ fuel-vocabs-words ] [ fuel-current-words ] if* natural-sort
-     swap [ drop-prefix nip length 0 = ] curry filter ;
+     swap fuel-filter-prefix ;
  
  : fuel-get-words ( prefix names -- )
      (fuel-get-words) fuel-eval-set-result ; inline
  
- : fuel-run-file ( path -- ) run-file ; inline
+ 
+ ! -run=fuel support
  
  : fuel-startup ( -- ) "listener" run-file ; inline