From f718269d508b249c2efcc3bb4e86446904a966e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Tue, 27 Jun 2017 19:17:52 +0200 Subject: [PATCH] FUEL: can use the factor-on-vocab function instead --- misc/fuel/fuel-edit.el | 7 +------ misc/fuel/fuel-xref.el | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/misc/fuel/fuel-edit.el b/misc/fuel/fuel-edit.el index ae022f0b87..756f06550f 100644 --- a/misc/fuel/fuel-edit.el +++ b/misc/fuel/fuel-edit.el @@ -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)))) diff --git a/misc/fuel/fuel-xref.el b/misc/fuel/fuel-xref.el index 7e7aadfb34..24141d4534 100644 --- a/misc/fuel/fuel-xref.el +++ b/misc/fuel/fuel-xref.el @@ -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)))))