FUEL: fix in autodoc require's and echo area font lock.

diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor
index 35ca438f31a191a85aa2fa086dcd92486452e254..7f6af22df870a0a9f1ec13289137717db33b4d08 100644 (file)
--- a/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@ -99,9 +99,7 @@ M: source-file fuel-pprint path>> fuel-pprint ;
     clone fuel-eval-result set-global ; inline
 
 : fuel-retort ( -- )
-    error get
-    fuel-eval-result get-global
-    fuel-eval-output get-global
+    error get fuel-eval-result get-global fuel-eval-output get-global
     3array fuel-pprint flush nl "<~FUEL~>" write nl flush ;
 
 : fuel-forget-error ( -- ) f error set-global ; inline

diff --git a/misc/fuel/fuel-autodoc.el b/misc/fuel/fuel-autodoc.el
index 96c47d2c69f5bc48d8ce9bdeff4777238a19f530..a1c1d19b982aa9622f4ce8971234861bb3f4f694 100644 (file)
--- a/misc/fuel/fuel-autodoc.el
+++ b/misc/fuel/fuel-autodoc.el
@@ -15,6 +15,7 @@
 ;;; Code:
 
 (require 'fuel-eval)
+(require 'fuel-font-lock)
 (require 'fuel-syntax)
 (require 'fuel-base)
 
@@ -36,6 +37,7 @@
 (defvar fuel-autodoc--font-lock-buffer
   (let ((buffer (get-buffer-create " *fuel help minibuffer messages*")))
     (set-buffer buffer)
+    (set-syntax-table fuel-syntax--syntax-table)
     (fuel-font-lock--font-lock-setup)
     buffer))
 
@@ -51,8 +53,8 @@
         (fuel-log--inhibit-p t))
     (when word
       (let* ((cmd (if (fuel-syntax--in-using)
-                      `(:fuel* (,word fuel-vocab-summary) t t)
-                    `(:fuel* (((:quote ,word) synopsis :get)) t)))
+                      `(:fuel* (,word fuel-vocab-summary) :in t)
+                    `(:fuel* (((:quote ,word) synopsis :get)) :in)))
              (ret (fuel-eval--send/wait cmd 20))
              (res (fuel-eval--retort-result ret)))
         (when (and ret (not (fuel-eval--retort-error ret)) (stringp res))

diff --git a/misc/fuel/fuel-eval.el b/misc/fuel/fuel-eval.el
index 204e7949250a904bc0227b08203eb47709f26f07..078a7005f83bb05b4d2f7a5759ad7acc6edf4d5d 100644 (file)
--- a/misc/fuel/fuel-eval.el
+++ b/misc/fuel/fuel-eval.el
@@ -67,7 +67,7 @@
   (cons :array (mapcar 'factor lst)))
 
 (defsubst factor--fuel-in (in)
-  (cond ((null in) :in)
+  (cond ((or (eq in :in) (null in)) :in)
         ((eq in 'f) 'f)
         ((eq in 't) "fuel-scratchpad")
         ((stringp in) in)