Merge commit 'origin/master' into emacs

diff --git a/extra/fuel/help/help.factor b/extra/fuel/help/help.factor
index 64d77566b5458fd22bde7a76f4eb04742e7cd7b8..6196b356ba49cedbd7231d1cd2f1f7e5fb2bdda1 100644 (file)
--- a/extra/fuel/help/help.factor
+++ b/extra/fuel/help/help.factor
@@ -31,6 +31,8 @@ IN: fuel.help
 : fuel-parent-topics ( word -- seq )
     help-path [ dup article-title swap 2array ] map ; inline
 
+SYMBOL: $doc-path
+
 : (fuel-word-element) ( word -- element )
     \ article swap dup article-title swap
     [
@@ -46,12 +48,13 @@ IN: fuel.help
     ] { } make 3array ;
 
 : fuel-vocab-help-row ( vocab -- element )
-    [ vocab-status-string ] [ vocab-name ] [ summary ] tri 3array ;
+    [ vocab-name ] [ summary ] bi 2array ;
 
 : fuel-vocab-help-root-heading ( root -- element )
     [ "Children from " prepend ] [ "Other children" ] if* \ $heading swap 2array ;
 
 SYMBOL: vocab-list
+SYMBOL: describe-words
 
 : fuel-vocab-help-table ( vocabs -- element )
     [ fuel-vocab-help-row ] map vocab-list prefix ;
@@ -69,7 +72,7 @@ SYMBOL: vocab-list
     all-child-vocabs fuel-vocab-list ; inline
 
 : fuel-vocab-describe-words ( name -- element )
-    [ describe-words ] with-string-writer \ describe-words swap 2array ; inline
+    [ words. ] with-string-writer \ describe-words swap 2array ; inline
 
 : (fuel-vocab-element) ( name -- element )
     dup require \ article swap dup >vocab-link

diff --git a/extra/fuel/xref/xref.factor b/extra/fuel/xref/xref.factor
index 5f5e28d1d288719c801d26ed71c59580d551b820..ec06b9892e0a008e2c492733618638f4622a1cff 100644 (file)
--- a/extra/fuel/xref/xref.factor
+++ b/extra/fuel/xref/xref.factor
@@ -3,7 +3,8 @@
 
 USING: accessors arrays assocs definitions help.topics io.pathnames
 kernel math math.order memoize namespaces sequences sets sorting
-tools.crossref tools.vocabs vocabs vocabs.parser words ;
+tools.completion tools.crossref tools.vocabs vocabs vocabs.parser
+words ;
 
 IN: fuel.xref
 

diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 3a00b70ab1dcb13dc3797b0817e2cacab184ebd0..80fe8e830b6e1fe5a793d1db0f50bc58c024dc70 100644 (file)
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -335,9 +335,8 @@
 
 (defun fuel-markup--vocab-list (e)
   (let ((rows (mapcar '(lambda (elem)
-                         (list (car elem)
-                               (list '$vocab-link (cadr elem))
-                               (caddr elem)))
+                         (list (list '$vocab-link (car elem))
+                               (cadr elem)))
                       (cdr e))))
     (fuel-markup--table (cons '$table rows))))