[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org a5e8dfa 3/5: Revert "ob-core.el: Add ability to use
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org a5e8dfa 3/5: Revert "ob-core.el: Add ability to use closures as default header arguments" |
Date: |
Wed, 29 Sep 2021 03:57:20 -0400 (EDT) |
branch: externals/org
commit a5e8dfaf5be72984925b759e06ab9812b032ad07
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>
Revert "ob-core.el: Add ability to use closures as default header arguments"
This reverts commit 78783f4e47901255695031dae0efcbb301a40878.
---
lisp/ob-core.el | 32 ++------------------------------
lisp/ob-exp.el | 2 +-
2 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index b039d32..c8380f7 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -472,23 +472,7 @@ For the format of SAFE-LIST, see
`org-babel-safe-header-args'."
(defvar org-babel-default-header-args
'((:session . "none") (:results . "replace") (:exports . "code")
(:cache . "no") (:noweb . "no") (:hlines . "no") (:tangle . "no"))
- "Default arguments to use when evaluating a source block.
-
-This is a list in which each element is an alist. Each key
-corresponds to a header argument, and each value to that header's
-value. The value can either be a string or a closure that
-evaluates to a string at runtime. For instance, imagine you'd
-like to set the file name output of a latex source block to a
-sha1 of its contents. We could achieve this with:
-
-(defun org-src-sha ()
- (let ((elem (org-element-at-point)))
- (concat (sha1 (org-element-property :value elem)) \".svg\")))
-
-(setq org-babel-default-header-args:latex
- `((:results . \"file link replace\")
- (:file . (lambda () (org-src-sha)))))")
-
+ "Default arguments to use when evaluating a source block.")
(put 'org-babel-default-header-args 'safe-local-variable
(org-babel-header-args-safe-fn org-babel-safe-header-args))
@@ -599,18 +583,6 @@ the outer-most code block.")
(defvar *this*)
-(defun eval-default-headers (headers)
- "Compute default header list set with HEADERS.
-
- Evaluate all default header arguments set to functions prior to
- returning the list of header arguments."
- (let ((lst nil))
- (dolist (elem (eval headers t))
- (if (listp (cdr elem))
- (push `(,(car elem) . ,(funcall (cdr elem))) lst)
- (push elem lst)))
- lst))
-
(defun org-babel-get-src-block-info (&optional light datum)
"Extract information from a source block or inline source block.
@@ -642,7 +614,7 @@ a list with the following pattern:
(apply #'org-babel-merge-params
(if inline org-babel-default-inline-header-args
org-babel-default-header-args)
- (and (boundp lang-headers) (eval-default-headers
lang-headers))
+ (and (boundp lang-headers) (eval lang-headers t))
(append
;; If DATUM is provided, make sure we get node
;; properties applicable to its location within
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 151ae71..e9b304b 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -104,7 +104,7 @@ Assume point is at block opening line."
(apply #'org-babel-merge-params
org-babel-default-header-args
(and (boundp lang-headers)
- (eval-default-headers lang-headers))
+ (symbol-value lang-headers))
(append (org-babel-params-from-properties lang)
(list raw-params)))))))
(setf hash (org-babel-sha1-hash info :export)))