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

FUEL: can use the factor-on-vocab function instead

modern-harvey2
Björn Lindqvist 2017-06-27 19:17:52 +02:00
parent dcb0cc8da7
commit f718269d50
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,11 +38,6 @@
((eq method 'frame) (find-file-other-frame file))
(t (find-file file))))
(defun fuel-edit--looking-at-vocab ()
(save-excursion
(factor-beginning-of-defun)
(looking-at "USING:\\|USE:\\|IN:")))
(defun fuel-edit--try-edit (ret)
(let* ((err (fuel-eval--retort-error ret))
(loc (fuel-eval--retort-result ret)))
@ -94,7 +89,7 @@ With prefix, asks for the word to edit."
(fuel-completion--read-word "Edit word: ")))
(cmd `(:fuel* ((:quote ,word) fuel-get-word-location)))
(marker (and (not arg) (point-marker))))
(if (and (not arg) (fuel-edit--looking-at-vocab))
(if (and (not arg) (factor-on-vocab))
(fuel-edit-vocabulary nil word)
(fuel-edit--try-edit (fuel-eval--send/wait cmd)))
(when marker (ring-insert find-tag-marker-ring marker))))

4
misc/fuel/fuel-xref.el
View File

@ -215,7 +215,7 @@ With prefix argument, ask for word."
(when word
(message "Looking up %s's users ..." word)
(if (and (not arg)
(fuel-edit--looking-at-vocab))
(factor-on-vocab))
(fuel-xref--show-vocab-usage word)
(fuel-xref--show-callers word)))))
@ -230,7 +230,7 @@ With prefix argument, ask for word."
(when word
(message "Looking up %s's callees ..." word)
(if (and (not arg)
(fuel-edit--looking-at-vocab))
(factor-on-vocab))
(fuel-xref--show-vocab-uses word)
(fuel-xref--show-callees word)))))