FUEL: Improved handling of documentation markup errors

The fuel-eval--retort-result-safe function can be used to get the
retort result and throw an error if the retort error is
set. E.g. (fuel-help "prettyprint") will now throw an error because
the markup is invalid instead of showing "No help available.."

diff --git a/misc/fuel/fuel-connection.el b/misc/fuel/fuel-connection.el
index e6e98c542ace9a03166e25b457d1f8095c998216..5ee1364c79788940978470aa4e64b7ab4bac4de3 100644 (file)
--- a/misc/fuel/fuel-connection.el
+++ b/misc/fuel/fuel-connection.el
@@ -188,13 +188,15 @@
   (get-buffer-create " *fuel connection retort*"))
 
 (defun fuel-con--comint-buffer-form ()
+  "Parse the text in the comint buffer into a
+sexp. fuel-con-error is thrown if the sexp is malformed."
   (with-current-buffer (fuel-con--comint-buffer)
     (goto-char (point-min))
-    (condition-case nil
+    (condition-case cerr
         (let ((form (read (current-buffer))))
           (if (listp form) form
             (list 'fuel-con-error (buffer-string))))
-      (error (list 'fuel-con-error (buffer-string))))))
+      (error (list 'fuel-con-error (format "%s" cerr))))))
 
 (defun fuel-con--process-next (con)
   (when (not (fuel-con--connection-current-request con))

diff --git a/misc/fuel/fuel-eval.el b/misc/fuel/fuel-eval.el
index 76c6708101ce60b7619749cdc1c2334bdbfaa6ee..39b94494b13f62daec508f7e3683b570c720d67e 100644 (file)
--- a/misc/fuel/fuel-eval.el
+++ b/misc/fuel/fuel-eval.el
@@ -121,6 +121,12 @@
 (defsubst fuel-eval--retort-result (ret) (nth 1 ret))
 (defsubst fuel-eval--retort-output (ret) (nth 2 ret))
 
+(defun fuel-eval--retort-result-safe (ret)
+  "Retort result or throws an error if the retort error is set."
+  (let ((err (fuel-eval--retort-error ret)))
+    (when err (error "%s" err))
+    (fuel-eval--retort-result ret)))
+
 (defsubst fuel-eval--retort-p (ret)
   (and (listp ret) (= 3 (length ret))))
 

diff --git a/misc/fuel/fuel-help.el b/misc/fuel/fuel-help.el
index 75fe1f6d150179e45a78fe79d16f25a34283338e..ab843c99bab5392c3168edea8ebf566828497b08 100644 (file)
--- a/misc/fuel/fuel-help.el
+++ b/misc/fuel/fuel-help.el
@@ -156,7 +156,7 @@
   (message "Retrieving help vocabulary for vocabulary '%s' ..." name)
   (let* ((cmd `(:fuel* ((,name fuel-vocab-help)) "fuel" (,name)))
          (ret (fuel-eval--send/wait cmd))
-         (res (fuel-eval--retort-result ret)))
+         (res (fuel-eval--retort-result-safe ret)))
     (if (not res)
         (message "No help available for vocabulary '%s'" name)
       (fuel-help--insert-contents (list name name 'vocab) res)