FUEL: Help browser: Fix for links to articles keyed by string lists.

diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor
index 46d6ba12c797f7e5604a074529340205890d5896..f52a34ff28fa5ea91b249d120639e40a25897801 100644 (file)
--- a/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@ -141,7 +141,7 @@ PRIVATE>
 
 : fuel-get-article ( name -- ) article fuel-eval-set-result ;
 
-MEMO: fuel-get-article-title ( name -- )
+: fuel-get-article-title ( name -- )
     articles get at [ article-title ] [ f ] if* fuel-eval-set-result ;
 
 : fuel-word-help ( name -- ) (fuel-word-help) fuel-eval-set-result ;

diff --git a/misc/fuel/fuel-eval.el b/misc/fuel/fuel-eval.el
index 543d23bd3f767f213d77a622ec422e3fcd30cff2..4c34ef17b8748fa116f488cc8c03fe0e5cd73c3d 100644 (file)
--- a/misc/fuel/fuel-eval.el
+++ b/misc/fuel/fuel-eval.el
@@ -31,6 +31,7 @@
         ((listp sexp)
          (case (car sexp)
            (:array (factor--seq 'V{ '} (cdr sexp)))
+           (:seq (factor--seq '{ '} (cdr sexp)))
            (:quote (format "\\ %s" (factor `(:factor ,(cadr sexp)))))
            (:quotation (factor--seq '\[ '\] (cdr sexp)))
            (:using (factor `(USING: ,@(cdr sexp) :end)))

diff --git a/misc/fuel/fuel-help.el b/misc/fuel/fuel-help.el
index 705d1469a29236357d1ce5757bd9bb9da05172cd..a82de388da955748f960d6e6c8d7ea21e68a068c 100644 (file)
--- a/misc/fuel/fuel-help.el
+++ b/misc/fuel/fuel-help.el
@@ -137,7 +137,8 @@
 
 (defun fuel-help--get-article (name label)
   (message "Retrieving article ...")
-  (let* ((cmd `(:fuel* ((,name fuel-get-article)) "fuel" t))
+  (let* ((name (if (listp name) (cons :seq name) name))
+         (cmd `(:fuel* ((,name fuel-get-article)) "fuel" t))
          (ret (fuel-eval--send/wait cmd))
          (res (fuel-eval--retort-result ret)))
     (if (not res)

diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 696e4ff0804256ae1de8271084379775569bff20..6a374cd5c88bbfea445e13dc05e72fff4ba88e29 100644 (file)
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -61,7 +61,7 @@
 
 (defun fuel-markup--insert-button (label link type)
   (let ((label (format "%s" label))
-        (link (format "%s" link)))
+        (link (if (listp link) link (format "%s" link))))
     (insert-text-button label
                         :type 'fuel-markup--button
                         'markup-link link
@@ -70,8 +70,9 @@
                         'help-echo (format "%s (%s)" label type))))
 
 (defun fuel-markup--article-title (name)
-  (fuel-eval--retort-result
-   (fuel-eval--send/wait `(:fuel* ((,name fuel-get-article-title)) "fuel"))))
+  (let ((name (if (listp name) (cons :seq name) name)))
+    (fuel-eval--retort-result
+     (fuel-eval--send/wait `(:fuel* ((,name fuel-get-article-title)) "fuel")))))
 
 (defun fuel-markup--link-at-point ()
   (let ((button (condition-case nil (forward-button 0) (error nil))))