[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 9b690462a3 3/5: Allow returning empty list from pos
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 9b690462a3 3/5: Allow returning empty list from post-processing block |
Date: |
Fri, 7 Oct 2022 00:57:55 -0400 (EDT) |
branch: externals/org
commit 9b690462a319e4268f15949bba0fe024dca77182
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Ihor Radchenko <yantar92@gmail.com>
Allow returning empty list from post-processing block
* lisp/ob-ref.el (org-babel-ref-resolve): When the result an empty
list, then treat it as a list, not as the symbol nil.
* testing/lisp/test-ob.el (test-ob/post-header-arguments): Add new
test.
* etc/ORG-NEWS (Post-processing code blocks can return an empty list):
Document change in behavior.
---
etc/ORG-NEWS | 6 ++++++
lisp/ob-ref.el | 2 +-
testing/lisp/test-ob.el | 24 ++++++++++++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 4728528f8b..74095d1015 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -425,6 +425,12 @@ The new variable name is =org-plantuml-args=. It now
applies to both
jar PlantUML file and executable.
** Miscellaneous
+*** Post-processing code blocks can return an empty list
+
+When the result of a regular code block is nil, then that was already
+treated as an empty list. Now that is also the case for code blocks
+that post-process the result of another block.
+
*** Styles are customizable in ~biblatex~ citation processor
It is now possible to add new styles or modify old ones in ~biblatex~
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index b79e479009..2b4a16aead 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -199,7 +199,7 @@ Emacs Lisp representation of the value of the variable."
(org-babel-execute-src-block nil info params))))
(error "Reference `%s' not found in this buffer" ref))))
(cond
- ((symbolp result) (format "%S" result))
+ ((and result (symbolp result)) (format "%S" result))
((and index (listp result))
(org-babel-ref-index-list index result))
(t result)))))))))
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index 99912fe639..9051a642de 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -136,6 +136,30 @@ should still return the link."
(let ((info (org-babel-get-src-block-info)))
(should (string= "no" (cdr (assq :tangle (nth 2 info))))))))
+(ert-deftest test-ob/post-header-arguments ()
+ "When the result of a post-processing source block is an empty
+list, then it should be treated as such; not as the symbol nil."
+ (should
+ (let ((default-directory temporary-file-directory))
+ (org-test-with-temp-text
+ "
+#+name: addheader
+#+header: :var rows=\"\"
+#+begin_src elisp :hlines yes
+ '()
+#+end_src
+#+header: :post addheader(*this*)
+#+<point>begin_src emacs-lisp :results table
+#+end_src
+#+RESULTS:
+: nil"
+ (org-babel-execute-src-block)
+ (goto-char (1- (point-max)))
+ (equal (buffer-substring-no-properties
+ (line-beginning-position)
+ (line-end-position))
+ "#+RESULTS:")))))
+
(ert-deftest test-ob/elisp-in-header-arguments ()
"Test execution of elisp forms in header arguments."
(org-test-with-temp-text-in-file "
- [elpa] externals/org updated (0b67b9f64f -> a220492064), ELPA Syncer, 2022/10/07
- [elpa] externals/org 9ef449224b 1/5: org-manual: Fix the location of "date tree" index entry, ELPA Syncer, 2022/10/07
- [elpa] externals/org a220492064 5/5: ob-sed: Fix typo, ELPA Syncer, 2022/10/07
- [elpa] externals/org 48ac65bea0 4/5: ob-sed-test: Make the tests pass on BSD systems, such as macOS, ELPA Syncer, 2022/10/07
- [elpa] externals/org 9b690462a3 3/5: Allow returning empty list from post-processing block,
ELPA Syncer <=
- [elpa] externals/org eece396db8 2/5: org-manual: Add example illustrating date tree, ELPA Syncer, 2022/10/07