From: "Marc Nieper-Wißkirchen" <marc@nieper-wisskirchen.de>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: "Rudolf Adamkovič" <salutis@me.com>, emacs-orgmode@gnu.org
Subject: Re: Babel (scheme): Evaluation errors are not shown
Date: Sat, 31 Dec 2022 14:11:20 +0100 [thread overview]
Message-ID: <CAEYrNrTtO-VjJKP2sjoGkM-D-5tN65eL0ur32TLoGCiGwxfWkQ@mail.gmail.com> (raw)
In-Reply-To: <87bknjbwtw.fsf@localhost>
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
Please find the patch file attached to this email.
Thank you,
Marc
Am Sa., 31. Dez. 2022 um 13:07 Uhr schrieb Ihor Radchenko <yantar92@posteo.net>:
>
> Marc Nieper-Wißkirchen <marc@nieper-wisskirchen.de> writes:
>
> > Please find attached a version that does not signal an Elisp user
> > error, but calls `org-babel-eval-error-notify' instead.
>
> If you can, could you please send the changes in form of a patch
> instead? It is then easier to review.
> See https://orgmode.org/worg/org-contribute.html#patches (you can just
> attach the patch to your reply).
>
> > To get rid of
> > the display of the arbitrary error code, could we modify
> > `org-babel-eval-error-notify' so that nothing is displayed about an
> > error if the error code is `nil'?
>
> Yes, we can. Feel free to make a patch, updating the docstring according
> to your changes.
>
> --
> Ihor Radchenko // yantar92,
> Org mode contributor,
> Learn more about Org mode at <https://orgmode.org/>.
> Support Org development at <https://liberapay.com/org-mode>,
> or support my work at <https://liberapay.com/yantar92>
[-- Attachment #2: 0001-Display-evaluation-errors-for-Scheme-code-blocks.patch --]
[-- Type: application/octet-stream, Size: 4193 bytes --]
From c804d69b6daad66d9d732b0f8adaf226af3641c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Nieper-Wi=C3=9Fkirchen?= <marc@nieper-wisskirchen.de>
Date: Sat, 31 Dec 2022 14:08:53 +0100
Subject: [PATCH] Display evaluation errors for Scheme code blocks.
---
lisp/ob-eval.el | 9 ++++++---
lisp/ob-scheme.el | 21 +++++++++++++++------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index f57566079..4f31b4109 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -37,16 +37,19 @@
(declare-function org-babel-temp-file "ob-core" (prefix &optional suffix))
(defun org-babel-eval-error-notify (exit-code stderr)
- "Open a buffer to display STDERR and a message with the value of EXIT-CODE."
+ "Open a buffer to display STDERR and a message with the value of EXIT-CODE.
+If EXIT-CODE is nil, suppress the message."
(let ((buf (get-buffer-create org-babel-error-buffer-name)))
(with-current-buffer buf
(goto-char (point-max))
(save-excursion
(unless (bolp) (insert "\n"))
(insert stderr)
- (insert (format "[ Babel evaluation exited with code %S ]" exit-code))))
+ (when exit-code
+ (insert (format "[ Babel evaluation exited with code %S ]" exit-code)))))
(display-buffer buf))
- (message "Babel evaluation exited with code %S" exit-code))
+ (when exit-code
+ (message "Babel evaluation exited with code %S" exit-code)))
(defun org-babel-eval (command query)
"Run COMMAND on QUERY.
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index 5be13bd89..e7c9db48d 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -4,7 +4,6 @@
;; Authors: Eric Schulte
;; Michael Gauland
-;; Maintainer: Rudolf Adamkovič <salutis@me.com>
;; Keywords: literate programming, reproducible research, scheme
;; URL: https://orgmode.org
@@ -66,6 +65,8 @@
(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))
+(declare-function geiser-eval--retort-error-msg "ext:geiser-eval" (err))
(defcustom org-babel-scheme-null-to 'hline
"Replace `null' and empty lists in scheme tables with this before returning."
@@ -194,22 +195,30 @@ is true; otherwise returns the last value."
#'geiser-eval-region)
(point-min)
(point-max))))
- (setq result (if output
+ (let ((err (geiser-eval--retort-error ret)))
+ (setq result (cond
+ (err nil)
+ (output
(or (geiser-eval--retort-output ret)
- "Geiser Interpreter produced no output")
- (geiser-eval--retort-result-str ret "")))))
+ "Geiser Interpreter produced no output"))
+ (t (geiser-eval--retort-result-str ret ""))))
(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)
- (kill-buffer repl-buffer)))))
+ (kill-buffer repl-buffer))
+ (when err
+ (let ((msg (geiser-eval--error-msg err)))
+ (org-babel-eval-error-notify
+ nil
+ (concat (if (listp msg) (car msg) msg) "\n"))))))))))
result))
(defun org-babel-scheme--table-or-string (results)
"Convert RESULTS into an appropriate elisp value.
If the results look like a list or tuple, then convert them into an
Emacs-lisp table, otherwise return the results as a string."
- (let ((res (org-babel-script-escape results)))
+ (let ((res (and results (org-babel-script-escape results))))
(cond ((listp res)
(mapcar (lambda (el)
(if (or (null el) (eq el 'null))
--
2.34.1
next prev parent reply other threads:[~2022-12-31 13:12 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 12:03 Babel (scheme): Evaluation errors are not shown Marc Nieper-Wißkirchen
2022-12-18 12:41 ` Ihor Radchenko
2022-12-20 0:39 ` Rudolf Adamkovič
2022-12-20 20:00 ` Marc Nieper-Wißkirchen
2022-12-31 9:50 ` Ihor Radchenko
2022-12-31 10:09 ` Marc Nieper-Wißkirchen
2022-12-31 10:19 ` Marc Nieper-Wißkirchen
2022-12-31 10:50 ` Marc Nieper-Wißkirchen
2022-12-31 12:07 ` Ihor Radchenko
2022-12-31 13:11 ` Marc Nieper-Wißkirchen [this message]
2022-12-31 13:24 ` Ihor Radchenko
2022-12-31 14:46 ` Marc Nieper-Wißkirchen
2023-01-01 13:53 ` Ihor Radchenko
2023-01-01 15:21 ` Marc Nieper-Wißkirchen
2023-01-02 9:38 ` Ihor Radchenko
2023-01-02 9:52 ` Marc Nieper-Wißkirchen
2023-01-03 9:07 ` Ihor Radchenko
2023-01-07 14:26 ` Marc Nieper-Wißkirchen
2023-01-25 13:12 ` Ihor Radchenko
2023-01-05 8:55 ` Marc Nieper-Wißkirchen
2023-01-06 16:17 ` Ihor Radchenko
2023-01-06 16:20 ` Ihor Radchenko
2023-01-06 16:32 ` tomas
2023-01-06 20:47 ` Marc Nieper-Wißkirchen
2023-01-07 13:28 ` Bastien Guerry
2022-12-21 13:25 ` Ihor Radchenko
2022-12-29 15:34 ` Bastien Guerry
2023-01-03 23:28 ` Rudolf Adamkovič
2023-01-03 23:35 ` Bastien
2023-01-06 20:45 ` Rudolf Adamkovič
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAEYrNrTtO-VjJKP2sjoGkM-D-5tN65eL0ur32TLoGCiGwxfWkQ@mail.gmail.com \
--to=marc@nieper-wisskirchen.de \
--cc=emacs-orgmode@gnu.org \
--cc=salutis@me.com \
--cc=yantar92@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).