tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

lisp/ob-core.el (org-babel-eval-headers): Fix elements ordering

Browse source 
* lisp/ob-core.el (org-babel-eval-headers): Fix elements ordering.
(org-babel-merge-params): Tiny refactoring.

This fixes the test `test-ob-lob/call-with-header-arguments' that
fails after 9f1507bdd.
This commit is contained in:
Bastien 2021-09-29 14:05:10 +02:00
parent 32b9251886
commit 1d5e41d41b
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lisp/ob-core.el
View file

@ -609,8 +609,6 @@ multiple blocks are being executed (e.g., in chained execution
through use of the :var header argument) this marker points to through use of the :var header argument) this marker points to
the outer-most code block.") the outer-most code block.")
(defvar *this*)
(defun org-babel-eval-headers (headers) (defun org-babel-eval-headers (headers)
"Compute header list set with HEADERS. "Compute header list set with HEADERS.
@ -618,11 +616,10 @@ Evaluate all header arguments set to functions prior to returning
the list of header arguments." the list of header arguments."
(let ((lst nil)) (let ((lst nil))
(dolist (elem headers) (dolist (elem headers)
(if (and (cdr elem) (if (and (cdr elem) (functionp (cdr elem)))
(functionp (cdr elem)))
(push `(,(car elem) . ,(funcall (cdr elem))) lst) (push `(,(car elem) . ,(funcall (cdr elem))) lst)
(push elem lst))) (push elem lst)))
lst)) (reverse lst)))
(defun org-babel-get-src-block-info (&optional light datum) (defun org-babel-get-src-block-info (&optional light datum)
"Extract information from a source block or inline source block. "Extract information from a source block or inline source block.
@ -2739,21 +2736,17 @@ parameters when merging lists."
results-exclusive-groups results-exclusive-groups
results results
(split-string (split-string
(if (stringp value) (cond ((stringp value) value)
value ((functionp value) (funcall value))
(if (functionp value) (t (eval value t)))))))
(funcall value)
(eval value t)))))))
(`(:exports . ,value) (`(:exports . ,value)
(setq exports (funcall merge (setq exports (funcall merge
exports-exclusive-groups exports-exclusive-groups
exports exports
(split-string (or (split-string
(if value (cond ((and value (functionp value)) (funcall value))
(if (functionp value) (value value)
(funcall value) (t ""))))))
value)
""))))))
;; Regular keywords: any value overwrites the previous one. ;; Regular keywords: any value overwrites the previous one.
(_ (setq params (cons pair (assq-delete-all (car pair) params))))))) (_ (setq params (cons pair (assq-delete-all (car pair) params)))))))
;; Handle `:var' and clear out colnames and rownames for replaced ;; Handle `:var' and clear out colnames and rownames for replaced