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

db4
Jose A. Ortega Ruiz 2008-12-27 15:18:17 +01:00
parent 7d4f4c5ed7
commit 90f6fef8d2
3 changed files with 6 additions and 6 deletions

View File

@ -99,9 +99,7 @@ M: source-file fuel-pprint path>> fuel-pprint ;
clone fuel-eval-result set-global ; inline clone fuel-eval-result set-global ; inline
: fuel-retort ( -- ) : fuel-retort ( -- )
error get error get fuel-eval-result get-global fuel-eval-output get-global
fuel-eval-result get-global
fuel-eval-output get-global
3array fuel-pprint flush nl "<~FUEL~>" write nl flush ; 3array fuel-pprint flush nl "<~FUEL~>" write nl flush ;
: fuel-forget-error ( -- ) f error set-global ; inline : fuel-forget-error ( -- ) f error set-global ; inline

View File

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

View File

@ -67,7 +67,7 @@
(cons :array (mapcar 'factor lst))) (cons :array (mapcar 'factor lst)))
(defsubst factor--fuel-in (in) (defsubst factor--fuel-in (in)
(cond ((null in) :in) (cond ((or (eq in :in) (null in)) :in)
((eq in 'f) 'f) ((eq in 'f) 'f)
((eq in 't) "fuel-scratchpad") ((eq in 't) "fuel-scratchpad")
((stringp in) in) ((stringp in) in)