From: Björn Lindqvist Date: Thu, 1 Feb 2018 14:43:27 +0000 (+0100) Subject: FUEL: fix rendering of $synopsis markup. X-Git-Tag: 0.98~379 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=d4e8d0a1fe06cebb1e6cc345b78e962f6950da48 FUEL: fix rendering of $synopsis markup. It is rendered exactly the same as $see markup. It works well and was the easiest fix to the problem. --- diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index cd8dd6a50c..02fc73b041 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -145,7 +145,7 @@ ($quotation . fuel-markup--quotation) ($references . fuel-markup--references) ($related . fuel-markup--related) - ($see . fuel-markup--see) + ($see . fuel-markup--word-info) ($see-also . fuel-markup--see-also) ($shuffle . fuel-markup--shuffle) ($side-effects . fuel-markup--side-effects) @@ -155,7 +155,7 @@ ($subheading . fuel-markup--subheading) ($subsection . fuel-markup--subsection) ($subsections . fuel-markup--subsections) - ($synopsis . fuel-markup--synopsis) + ($synopsis . fuel-markup--word-info) ($syntax . fuel-markup--syntax) ($table . fuel-markup--table) ($tag . fuel-markup--tag) @@ -663,9 +663,13 @@ the 'words.' word emits." (defun fuel-markup--notes (e) (fuel-markup--elem-with-heading e "Notes")) -(defun fuel-markup--word-info (e s) +(defun fuel-markup--word-info (e) + "Uses the 'see' word to lookup info about a given word. Note +that this function is called in contexts where it is impossible +to guess the correct usings, so a static using list is used." (let* ((word (nth 1 e)) - (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) ,s) "fuel"))) + (cmd `(:fuel* ((:quote ,(symbol-name word)) see) + "fuel" ("kernel" "lexer" "see" "sequences"))) (ret (and cmd (fuel-eval--send/wait cmd))) (res (and (not (fuel-eval--retort-error ret)) (fuel-eval--retort-output ret)))) @@ -673,12 +677,6 @@ the 'words.' word emits." (fuel-markup--code (list '$code res) nil) (fuel-markup--snippet (list '$snippet " " word))))) -(defun fuel-markup--see (e) - (fuel-markup--word-info e 'see)) - -(defun fuel-markup--synopsis (e) - (fuel-markup--word-info e 'synopsis)) - (defun fuel-markup--null (e))