branch: elpa/geiser
commit 5bf62132e676e098ab7ab6332fede2ead8328074
Author: jao <j...@gnu.org>
Commit: jao <j...@gnu.org>
debug: accept debug msg of any type (e.g., a list with location info)
---
elisp/geiser-debug.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/elisp/geiser-debug.el b/elisp/geiser-debug.el
index 15f963f677..dc60fb6e0a 100644
--- a/elisp/geiser-debug.el
+++ b/elisp/geiser-debug.el
@@ -275,7 +275,9 @@ buffer.")
(when (or err key output)
(let ((msg (or (geiser-eval--error-msg err) output "")))
(or (geiser-debug--display-error impl module key msg)
- (insert "\n" (if key (format "Error: %s\n" key) "") msg
"\n"))))
+ (insert "\n"
+ (if key (format "Error: %s\n" key) "")
+ (format "%s" (or msg "")) "\n"))))
(when after
(goto-char (point-max))
(insert "\nExpression evaluated was:\n\n")
@@ -313,10 +315,9 @@ result in the minibuffer."
(code `(,(if compile :comp :eval) (:scm ,wrapped)))
(cont (lambda (ret)
(let ((res (geiser-eval--retort-result-str ret nil))
- (err (geiser-eval--retort-error ret))
(scstr (geiser-syntax--scheme-str str)))
(when and-go (funcall and-go))
- (when (not err)
+ (unless (geiser-eval--retort-error ret)
(save-excursion
(goto-char (/ (+ end start) 2))
(geiser-autodoc--clean-cache))
