I just realized I was un-CCed out of the thread
Here's the updated patch with the requested changes (actually single one)
Lemme know if I'm missing anything else.
Felipe
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index f4836b23fe..8720bd099e 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -39,6 +39,7 @@
;;; Code:
(require 'ob)
+(require 'subr-x)
(require 'geiser nil t)
(require 'geiser-impl nil t)
(defvar geiser-repl--repl) ; Defined in geiser-repl.el
@@ -58,6 +59,7 @@ geiser-repl-window-allow-split
(declare-function geiser-repl-exit "ext:geiser-repl" (&optional arg))
(declare-function geiser-eval--retort-output "ext:geiser-eval" (ret))
(declare-function geiser-eval--retort-result-str "ext:geiser-eval" (ret prefix))
+(declare-function geiser-eval--retort-error "ext:geiser-eval" (ret))
(defcustom org-babel-scheme-null-to 'hline
"Replace `null' and empty lists in scheme tables with this before returning."
@@ -180,8 +182,20 @@ org-babel-scheme-execute-with-geiser
(setq result (if output
(or (geiser-eval--retort-output ret)
"Geiser Interpreter produced no output")
- (geiser-eval--retort-result-str ret "")))))
- (when (not repl)
+ (geiser-eval--retort-result-str ret "")))
+ (when-let* ((err (geiser-eval--retort-error ret)))
+ ;; there was an error, report it!
+ (org-babel-eval-error-notify
+ -1 ;; filler value, anything non-zero should do
+ (geiser-eval--retort-output ret))
+ (save-excursion
+ (when (get-buffer org-babel-error-buffer-name)
+ (with-current-buffer org-babel-error-buffer-name
+ (unless (derived-mode-p 'compilation-mode)
+ (compilation-mode))
+ ;; Compilation-mode enforces read-only, but Babel expects the buffer modifiable.
+ (setq buffer-read-only nil)))))))
+ (when (not repl)
(save-current-buffer (set-buffer repl-buffer)
(geiser-repl-exit))
(set-process-query-on-exit-flag (get-buffer-process repl-buffer) nil)
