ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

babel: Get rid of parameter inheritance by reference blocks

This commit is contained in:
Dan Davison 2010-03-27 17:09:10 -04:00
parent 36351d26a9
commit a23ca4529f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/babel/lisp/org-babel-ref.el
View File

@ -61,12 +61,12 @@ names, and the emacs-lisp representation of the related value."
(delq nil (mapcar (lambda (pair) (if (eq (car pair) :var) (cdr pair))) params))) (delq nil (mapcar (lambda (pair) (if (eq (car pair) :var) (cdr pair))) params)))
(others (others
(delq nil (mapcar (lambda (pair) (unless (eq :var (car pair)) pair)) params)))) (delq nil (mapcar (lambda (pair) (unless (eq :var (car pair)) pair)) params))))
(mapcar (lambda (assignment) (org-babel-ref-parse assignment others)) assignments))) (mapcar (lambda (assignment) (org-babel-ref-parse assignment)) assignments)))
(defvar org-babel-ref-split-regexp (defvar org-babel-ref-split-regexp
"[ \f\t\n\r\v]*\\(.+?\\)[ \f\t\n\r\v]*=[ \f\t\n\r\v]*\\(.+\\)[ \f\t\n\r\v]*") "[ \f\t\n\r\v]*\\(.+?\\)[ \f\t\n\r\v]*=[ \f\t\n\r\v]*\\(.+\\)[ \f\t\n\r\v]*")
(defun org-babel-ref-parse (assignment params) (defun org-babel-ref-parse (assignment &optional params)
"Parse a variable ASSIGNMENT in a header argument. If the "Parse a variable ASSIGNMENT in a header argument. If the
right hand side of the assignment has a literal value return that right hand side of the assignment has a literal value return that
value, otherwise interpret as a reference to an external resource value, otherwise interpret as a reference to an external resource
@ -92,7 +92,7 @@ return nil."
(read ref)) (read ref))
out))) out)))
(defun org-babel-ref-resolve-reference (ref params) (defun org-babel-ref-resolve-reference (ref &optional params)
"Resolve the reference and return its value" "Resolve the reference and return its value"
(save-excursion (save-excursion
(let ((case-fold-search t) (let ((case-fold-search t)