From: Björn Lindqvist <bjourne@gmail.com>
Date: Wed, 7 Feb 2018 19:49:46 +0000 (+0100)
Subject: FUEL: fuel-edit-word is kind of redundant
X-Git-Tag: 0.98~357
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=8c223d40736c3150771cc8b0bda59d4aa873d628

FUEL: fuel-edit-word is kind of redundant

fuel-edit-word-at-point does the same job when the caret is not on a
word.
---

diff --git a/misc/fuel/README.md b/misc/fuel/README.md
index 0f9a0a9294..3df7f0697f 100644
--- a/misc/fuel/README.md
+++ b/misc/fuel/README.md
@@ -111,12 +111,11 @@ M-x <command>, not necessarily in a factor buffer.
     | C-x 4 s            | switch to other factor buffer in other window              |
     | C-x 5 s            | switch to other factor buffer in other frame               |
     |--------------------+------------------------------------------------------------|
-    | M-.                | edit word at point in Emacs (fuel-edit-word)               |
+    | M-.                | edit word/vocab at point in Emacs (fuel-edit-word-at-point)|
     | M-,                | go back to where M-. was last invoked                      |
     | M-TAB              | complete word at point                                     |
     | C-c C-e u          | update USING: line (fuel-update-usings)                    |
     | C-c C-e v          | edit vocabulary (fuel-edit-vocabulary)                     |
-    | C-c C-e w          | edit word (fuel-edit-word-at-point)                        |
     | C-c C-e d          | edit word's doc (C-u M-x fuel-edit-word-doc-at-point)      |
     | C-c C-e l          | load vocabs in USING: form                                 |
     |--------------------+------------------------------------------------------------|
diff --git a/misc/fuel/fuel-edit.el b/misc/fuel/fuel-edit.el
index 756f06550f..27e51ab2df 100644
--- a/misc/fuel/fuel-edit.el
+++ b/misc/fuel/fuel-edit.el
@@ -69,18 +69,6 @@ With prefix argument, refreshes cached vocabulary list."
     (fuel-edit--try-edit (fuel-eval--send/wait cmd))))
 
 ;;;###autoload
-(defun fuel-edit-word (&optional arg)
-  "Asks for a word to edit, with completion.
-With prefix, only words visible in the current vocabulary are
-offered."
-  (interactive "P")
-  (let* ((word (fuel-completion--read-word "Edit word: "
-                                           nil
-                                           fuel-edit--word-history
-                                           arg))
-         (cmd `(:fuel* ((:quote ,word) fuel-get-word-location))))
-    (fuel-edit--try-edit (fuel-eval--send/wait cmd))))
-
 (defun fuel-edit-word-at-point (&optional arg)
   "Opens a new window visiting the definition of the word at point.
 With prefix, asks for the word to edit."
diff --git a/misc/fuel/fuel-help.el b/misc/fuel/fuel-help.el
index de653c7182..c7d8455e81 100644
--- a/misc/fuel/fuel-help.el
+++ b/misc/fuel/fuel-help.el
@@ -328,7 +328,7 @@ With prefix, the current page is deleted from history."
   ("Show bookmarks..." "bb" fuel-help-display-bookmarks)
   ("Clean browsing history" "c" fuel-help-clean-history)
   --
-  ("Edit word at point" "\M-." fuel-edit-word-at-point)
+  ("Edit word or vocab at point" "\M-." fuel-edit-word-at-point)
   ("Edit help file" "e" fuel-help-edit)
   --
   ("Next page" "n" fuel-help-next)
diff --git a/misc/fuel/fuel-listener.el b/misc/fuel/fuel-listener.el
index 2339b623f8..f33b6a67d7 100644
--- a/misc/fuel/fuel-listener.el
+++ b/misc/fuel/fuel-listener.el
@@ -274,8 +274,7 @@ the vocabulary name."
 (fuel-menu--defmenu listener fuel-listener-mode-map
   ("Complete symbol" ((kbd "TAB") (kbd "M-TAB"))
    fuel-completion--complete-symbol :enable (symbol-at-point))
-  ("Edit word definition" "\M-." fuel-edit-word-at-point
-   :enable (symbol-at-point))
+  ("Edit word or vocab at point" "\M-." fuel-edit-word-at-point)
   ("Edit vocabulary" "\C-c\C-v" fuel-edit-vocabulary)
   --
   ("Word help" "\C-c\C-w" fuel-help)
diff --git a/misc/fuel/fuel-mode.el b/misc/fuel/fuel-mode.el
index 043ef1c97d..072291cdfc 100644
--- a/misc/fuel/fuel-mode.el
+++ b/misc/fuel/fuel-mode.el
@@ -185,9 +185,8 @@ interacting with a factor listener is at your disposal.
   ("Eval region" ("\C-c\C-e\C-r" "\C-c\C-er")
    fuel-eval-region :enable mark-active)
   --
-  ("Edit word at point" ("\M-." "\C-c\C-e\C-d" "\C-c\C-ed")
-   fuel-edit-word-at-point :enable (symbol-at-point))
-  ("Edit word..." ("\C-c\C-e\C-w" "\C-c\C-ew") fuel-edit-word)
+  ("Edit word or vocab at point..." ("\M-." "\C-c\C-e\C-d" "\C-c\C-ed")
+   fuel-edit-word-at-point)
   ("Edit vocab..." ("\C-c\C-e\C-v" "\C-c\C-ev") fuel-edit-vocabulary)
   ("Jump back" "\M-," fuel-edit-pop-edit-word-stack)
   --