diff --git a/extra/fuel/help/help.factor b/extra/fuel/help/help.factor index e70327bd35..55183734b3 100644 --- a/extra/fuel/help/help.factor +++ b/extra/fuel/help/help.factor @@ -2,15 +2,15 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs combinators help help.crossref -help.markup help.topics io io.streams.string kernel make memoize -namespaces parser prettyprint sequences summary tools.vocabs -tools.vocabs.browser vocabs vocabs.loader words ; +help.markup help.topics io io.streams.string kernel make namespaces +parser prettyprint sequences summary tools.vocabs tools.vocabs.browser +vocabs vocabs.loader words ; IN: fuel.help > ] dip = ] curry all-words swap filter dup empty? not [ first ] [ drop f ] if ; @@ -102,11 +102,11 @@ PRIVATE> : (fuel-vocab-help) ( name -- str ) dup empty? [ fuel-vocab-children-help ] [ (fuel-vocab-element) ] if ; -MEMO: (fuel-get-vocabs/author) ( author -- element ) +: (fuel-get-vocabs/author) ( author -- element ) [ "Vocabularies by " prepend \ $heading swap 2array ] [ authored fuel-vocab-list ] bi 2array ; -MEMO: (fuel-get-vocabs/tag) ( tag -- element ) +: (fuel-get-vocabs/tag) ( tag -- element ) [ "Vocabularies tagged " prepend \ $heading swap 2array ] [ tagged fuel-vocab-list ] bi 2array ; diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index 7a8fa0c234..2784335fbb 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -585,12 +585,13 @@ (defun fuel-markup--see (e) (let* ((word (nth 1 e)) - (cmd (and word `(:fuel* (,(format "%s" word) fuel-word-see) "fuel" t))) - (res (and cmd - (fuel-eval--retort-result (fuel-eval--send/wait cmd 100))))) + (cmd (and word `(:fuel* ((:quote ,(format "%S" word)) see) "fuel"))) + (ret (and cmd (fuel-eval--send/wait cmd))) + (res (and (not (fuel-eval--retort-error ret)) + (fuel-eval--retort-output ret)))) (if res (fuel-markup--code (list '$code res)) - (fuel-markup--snippet (list '$snippet word))))) + (fuel-markup--snippet (list '$snippet " " word))))) (defun fuel-markup--null (e))