FUEL: improves the fuel-update-usings feature

Now it works even when the USING: list should be empty.

diff --git a/misc/fuel/fuel-debug-uses.el b/misc/fuel/fuel-debug-uses.el
index 36076a2637a07a3250530ff11036d2de10200a03..119d17ad0e01917a01194f9d04cda545ef678906 100644 (file)
--- a/misc/fuel/fuel-debug-uses.el
+++ b/misc/fuel/fuel-debug-uses.el
@@ -121,8 +121,9 @@
 (defun fuel-debug--uses-cont (retort)
   (let ((uses (fuel-debug--uses retort))
         (err (fuel-eval--retort-error retort)))
-    (if uses (fuel-debug--uses-display uses)
-      (fuel-debug--uses-display-err retort))))
+    (if err
+        (fuel-debug--uses-display-err retort)
+      (fuel-debug--uses-display uses))))
 
 (defun fuel-debug--uses-display (uses)
   (let* ((inhibit-read-only t)
@@ -164,7 +165,7 @@
   (let ((inhibit-read-only t)
         (file fuel-debug--uses-file)
         (uses fuel-debug--uses))
-    (when (and uses file)
+    (when file
       (insert "\nDone!")
       (fuel-debug--uses-clean)
       (fuel-popup--quit)

diff --git a/misc/fuel/fuel-debug.el b/misc/fuel/fuel-debug.el
index 25e3cf6e4ae88a906a50d27b1a0806e24e569cae..7f9dc3ea4130ee5e0fc9abbcc58b0b7ac19d779d 100644 (file)
--- a/misc/fuel/fuel-debug.el
+++ b/misc/fuel/fuel-debug.el
@@ -318,8 +318,9 @@ the debugger."
     (beginning-of-line)
     (open-line 2)
     (insert "USING: "))
-  (let ((start (point)))
-    (insert (mapconcat 'substring-no-properties uses " ") " ;")
+  (let ((start (point))
+        (tokens (append uses '(";"))))
+    (insert (mapconcat 'substring-no-properties tokens " "))
     (fill-region start (point) nil)))
 
 (defun fuel-debug-update-usings ()