[nongnu] elpa/geiser-chibi 6d73a7e 07/38: Catch eval and send back eval exception information

[Philip Kaludercic]

branch: elpa/geiser-chibi
commit 6d73a7ebdd0279e8cd2e0c908d6a489fc559077c
Author: Edwin Watkeys <edw@poseur.com>
Commit: Jose Antonio Ortega Ruiz <jao@gnu.org>

    Catch eval and send back eval exception information
---
 scheme/chibi/geiser/geiser.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/scheme/chibi/geiser/geiser.scm b/scheme/chibi/geiser/geiser.scm
index 79a1b4e..96399c3 100644
--- a/scheme/chibi/geiser/geiser.scm
+++ b/scheme/chibi/geiser/geiser.scm
@@ -20,14 +20,15 @@
 
 (define (geiser:eval module form . rest)
   rest
-  (let ((output (open-output-string))
-        (result (if module
-                    (let ((mod (module-env (find-module module))))
-                      (eval form mod))
-                    (eval form))))
-    (write `((result ,(write-to-string result))
-             (output . ,(get-output-string output))))
-    (values)))
+  (guard (err (else (write `((result ,(show #f err))))))
+    (let ((output (open-output-string))
+          (result (if module
+                      (let ((mod (module-env (find-module module))))
+                        (eval form mod))
+                      (eval form))))
+      (write `((result ,(write-to-string result))
+               (output . ,(get-output-string output))))))
+  (values))
 
 (define (geiser:module-completions prefix . rest)
   ;; (available-modules) walks the directory tree and is too slow