fuel: Incorporate refresh-and-test-all

[factor.git] / misc / fuel / fuel-mode.el

diff --git a/misc/fuel/fuel-mode.el b/misc/fuel/fuel-mode.el
index 8a4a51b718f3eb0597656367a73c8d2bac8762c3..86c454bbe0699cc2c407bb5db1240636af8a6c91 100644 (file)
--- a/misc/fuel/fuel-mode.el
+++ b/misc/fuel/fuel-mode.el
@@ -1,4 +1,4 @@
-;;; fuel-mode.el -- Minor mode enabling FUEL niceties
+;;; fuel-mode.el --- Major mode for editing Factor programs. -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2008, 2009, 2010 Jose Antonio Ortega Ruiz
 ;; See http://factorcode.org/license.txt for BSD license.
@@ -7,10 +7,10 @@
 ;; Keywords: languages, fuel, factor
 ;; Start date: Sat Dec 06, 2008 00:52
 
-;;; Comentary:
+;;; Commentary:
 
-;; Enhancements to vanilla factor-mode (notably, listener interaction)
-;; enabled by means of a minor mode.
+;; A major mode (factor-mode) for editing Factor programs and a minor mode
+;; (fuel-mode) for interacting with a running Factor image.
 
 ;;; Code:
 
@@ -123,8 +123,7 @@ buffer in case of errors."
 (defun fuel-load-usings ()
   "Loads all vocabularies in the current buffer's USING: from.
 Useful to activate autodoc help messages in a vocabulary not yet
-loaded. See documentation for `fuel-autodoc-eval-using-form-p'
-for details."
+loaded."
   (interactive)
   (message "Loading all vocabularies in USING: form ...")
   (let ((err (fuel-eval--retort-error
@@ -183,25 +182,23 @@ interacting with a factor listener is at your disposal.
    fuel-eval-definition)
   ("Eval extended region" ("\C-\M-r" "\C-c\C-e\C-e" "\C-c\C-ee")
    fuel-eval-extended-region :enable mark-active)
-  ("Eval region" ("\C-c\C-r" "\C-c\C-e\C-r" "\C-c\C-er")
+  ("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)
   --
   ("Help on word" ("\C-c\C-d\C-d" "\C-c\C-dd") fuel-help)
-  ("Short help on word" ("\C-c\C-d\C-s" "\C-c\C-ds") fuel-help)
   ("Apropos..." ("\C-c\C-d\C-p" "\C-c\C-dp") fuel-apropos)
   ("Show stack effect" ("\C-c\C-d\C-e" "\C-c\C-de") fuel-stack-effect-sexp)
   --
-  ("Show all words" ("\C-c\C-d\C-v" "\C-c\C-dv") fuel-show-file-words)
-  ("Word callers" "\C-c\M-<" fuel-show-callers :enable (symbol-at-point))
-  ("Word callees" "\C-c\M->" fuel-show-callees :enable (symbol-at-point))
-  (mode "Autodoc mode" ("\C-c\C-d\C-a" "\C-c\C-da") fuel-autodoc-mode)
-  --
+  (menu "Crossref"
+        ("Show all words" ("\C-c\C-d\C-v" "\C-c\C-dv") fuel-show-file-words)
+        ("Word callers" "\C-c\M-<" fuel-show-callers :enable (symbol-at-point))
+        ("Word callees" "\C-c\M->" fuel-show-callees :enable (symbol-at-point))
+        (mode "Autodoc mode" ("\C-c\C-d\C-a" "\C-c\C-da") fuel-autodoc-mode))
   (menu "Refactor"
         ("Rename word" ("\C-c\C-x\C-w" "\C-c\C-xw") fuel-refactor-rename-word)
         ("Inline word" ("\C-c\C-x\C-i" "\C-c\C-xi") fuel-refactor-inline-word)
@@ -216,11 +213,20 @@ interacting with a factor listener is at your disposal.
         --
         ("Extract article" ("\C-c\C-x\C-a" "\C-c\C-xa")
          fuel-refactor-extract-article))
+  (menu "Scaffold"
+        ("New vocab" ("\C-c\C-c\C-v") fuel-scaffold-vocab)
+        ("Tests for vocab" ("\C-c\C-c\C-t") fuel-scaffold-tests)
+        ("Help for vocab" ("\C-c\C-c\C-h") fuel-scaffold-help)
+        ("Tags for vocab" ("\C-c\C-c\C-g") fuel-scaffold-tags)
+        ("Summary for vocab" ("\C-c\C-c\C-s") fuel-scaffold-summary)
+        ("Authors for vocab" ("\C-c\C-c\C-a") fuel-scaffold-authors)
+        ("Platforms for vocab" ("\C-c\C-c\C-p") fuel-scaffold-platforms))
   --
   ("Load used vocabs" ("\C-c\C-e\C-l" "\C-c\C-el") fuel-load-usings)
   ("Run file" ("\C-c\C-k" "\C-c\C-l" "\C-c\C-e\C-k") fuel-run-file)
   ("Run unit tests" "\C-c\C-t" fuel-test-vocab)
   ("Refresh vocabs" "\C-c\C-r" fuel-refresh-all)
+  ("Refresh vocabs and test" "\C-c\M-r" fuel-refresh-and-test-all)
   --
   (menu "Switch to"
         ("Listener" "\C-c\C-z" run-factor)