Fix for output display in schemes not defining their own handler

See discussion in issue #21.

1 files changed, 6 insertions, 7 deletions

diff --git a/elisp/geiser-debug.el b/elisp/geiser-debug.el
index efb3846..a43de73 100644
--- a/elisp/geiser-debug.el
+++ b/elisp/geiser-debug.el
@@ -170,21 +170,20 @@ buffer.")
     (geiser-debug--with-buffer
       (erase-buffer)
       (when dir (setq default-directory dir))
-      (unless after
-        (geiser-debug--display-error impl module nil what)
-        (goto-char (point-max))
-        (newline 2))
+      (unless after (insert what "\n\n"))
       (setq img (when (and res (not err)) (geiser-debug--insert-res res)))
-      (setq dbg (geiser-debug--display-error impl module key output))
+      (when (or key output)
+        (or (geiser-debug--display-error impl module key output)
+            (insert "\n" (if key (format "%s\n" key) "") output "\n")))
       (when after
         (goto-char (point-max))
         (insert "\nExpression evaluated was:\n\n")
-        (geiser-debug--display-error impl module nil what))
+        (insert what "\n"))
       (cl-case geiser-debug-treat-ansi-colors
         (colors (ansi-color-apply-on-region (point-min) (point-max)))
         (remove (ansi-color-filter-region (point-min) (point-max))))
       (goto-char (point-min)))
-    (when (or img dbg)
+    (when (or img dbg output)
       (when (or geiser-debug-jump-to-debug-p geiser-debug-show-debug-p)
         (if geiser-debug-jump-to-debug-p
             (geiser-debug--pop-to-buffer)