branch: externals/org
commit b255cb13a7dd96da2f022020deae55fe5d8d8929
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Partially revert 03a9dd88b ob-scheme: Fix variable assignment for list
values
* lisp/ob-scheme.el (org-babel-scheme--get-impl): Ignore null and ()
in cons cells. The purpose is tables and cons cells cannot be tables.
* testing/lisp/test-ob-scheme.el (test-ob-scheme/list-conversion):
Remove test case that tested for converting nulls in cons cells.
Link: https://orgmode.org/list/[email protected]
---
lisp/ob-scheme.el | 18 ------------------
testing/lisp/test-ob-scheme.el | 7 -------
2 files changed, 25 deletions(-)
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index 4627123267..77b7af6dac 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -242,24 +242,6 @@ an Emacs Lisp table, otherwise return the results as a
string."
org-babel-scheme-null-to
el))
res))
- ((consp res) ; improper list ending with cons cell
- (cl-labels ((maybe-convert (el)
- (if (or (null el) (eq el 'null))
- org-babel-scheme-null-to
- el)))
- (let* ((converted (cons (maybe-convert (car res)) nil))
- (tail converted))
- (setq res (cdr res))
- (while res
- (if (not (consp res))
- ;; end of cons
- (progn
- (setcdr tail res)
- (setq res nil))
- (setcdr tail (list (maybe-convert (car res))))
- (setq tail (cdr tail))
- (setq res (cdr res))))
- converted)))
(t res))))
(defun org-babel-scheme--get-impl (&optional params)
diff --git a/testing/lisp/test-ob-scheme.el b/testing/lisp/test-ob-scheme.el
index 9fd2e9afdc..c6a1ddcccd 100644
--- a/testing/lisp/test-ob-scheme.el
+++ b/testing/lisp/test-ob-scheme.el
@@ -85,13 +85,6 @@
(let ((case-fold-search t)) (search-forward "#+results"))
(buffer-substring-no-properties (line-beginning-position 2)
(point-max)))))
- (should
- (equal ": (hline . 3)\n"
- (org-test-with-temp-text "#+begin_src scheme\n'(null . 3)\n#+end_src"
- (org-babel-execute-maybe)
- (let ((case-fold-search t)) (search-forward "#+results"))
- (buffer-substring-no-properties (line-beginning-position 2)
- (point-max)))))
(should
(equal "| 1 | nil | 3 |\n"
(let ((org-babel-scheme-null-to nil))
