steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'emacs' of http://git.hacks-galore.org/jao/factor

db4
Daniel Ehrenberg 2009-01-15 17:39:33 -06:00
parent 11b9dbfcd5 756464a487
commit 4583852caf
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/fuel/fuel.factor
View File

@ -141,7 +141,7 @@ PRIVATE>
: fuel-get-article ( name -- ) article fuel-eval-set-result ; : 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 ; articles get at [ article-title ] [ f ] if* fuel-eval-set-result ;
: fuel-word-help ( name -- ) (fuel-word-help) fuel-eval-set-result ; : fuel-word-help ( name -- ) (fuel-word-help) fuel-eval-set-result ;

1
misc/fuel/fuel-eval.el
View File

@ -31,6 +31,7 @@
((listp sexp) ((listp sexp)
(case (car sexp) (case (car sexp)
(:array (factor--seq 'V{ '} (cdr sexp))) (:array (factor--seq 'V{ '} (cdr sexp)))
(:seq (factor--seq '{ '} (cdr sexp)))
(:quote (format "\\ %s" (factor `(:factor ,(cadr sexp))))) (:quote (format "\\ %s" (factor `(:factor ,(cadr sexp)))))
(:quotation (factor--seq '\[ '\] (cdr sexp))) (:quotation (factor--seq '\[ '\] (cdr sexp)))
(:using (factor `(USING: ,@(cdr sexp) :end))) (:using (factor `(USING: ,@(cdr sexp) :end)))

3
misc/fuel/fuel-help.el
View File

@ -137,7 +137,8 @@
(defun fuel-help--get-article (name label) (defun fuel-help--get-article (name label)
(message "Retrieving article ...") (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)) (ret (fuel-eval--send/wait cmd))
(res (fuel-eval--retort-result ret))) (res (fuel-eval--retort-result ret)))
(if (not res) (if (not res)

7
misc/fuel/fuel-markup.el
View File

@ -61,7 +61,7 @@
(defun fuel-markup--insert-button (label link type) (defun fuel-markup--insert-button (label link type)
(let ((label (format "%s" label)) (let ((label (format "%s" label))
(link (format "%s" link))) (link (if (listp link) link (format "%s" link))))
(insert-text-button label (insert-text-button label
:type 'fuel-markup--button :type 'fuel-markup--button
'markup-link link 'markup-link link
@ -70,8 +70,9 @@
'help-echo (format "%s (%s)" label type)))) 'help-echo (format "%s (%s)" label type))))
(defun fuel-markup--article-title (name) (defun fuel-markup--article-title (name)
(fuel-eval--retort-result (let ((name (if (listp name) (cons :seq name) name)))
(fuel-eval--send/wait `(:fuel* ((,name fuel-get-article-title)) "fuel")))) (fuel-eval--retort-result
(fuel-eval--send/wait `(:fuel* ((,name fuel-get-article-title)) "fuel")))))
(defun fuel-markup--link-at-point () (defun fuel-markup--link-at-point ()
(let ((button (condition-case nil (forward-button 0) (error nil)))) (let ((button (condition-case nil (forward-button 0) (error nil))))