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

ob: now looking for header arguments in #+Properties: as well as #+Babel: 

* lisp/ob.el (org-babel-params-from-buffer): Now looking for header
  arguments in #+Properties: as well as #+Babel:.  Also, we're no
  longer caching these results into a file local variable.
This commit is contained in:
Eric Schulte 2011-04-14 20:37:21 -06:00
parent 28b325fa1e
commit 60864e851b
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lisp/ob.el
View File

@ -306,10 +306,6 @@ specific header arguments as well.")
'((:session . "none") (:results . "replace") (:exports . "results")) '((:session . "none") (:results . "replace") (:exports . "results"))
"Default arguments to use when evaluating an inline source block.") "Default arguments to use when evaluating an inline source block.")
(defvar org-babel-current-buffer-properties nil
"Local cache for buffer properties.")
(make-variable-buffer-local 'org-babel-current-buffer-properties)
(defvar org-babel-result-regexp (defvar org-babel-result-regexp
"^[ \t]*#\\+res\\(ults\\|name\\)\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:[ \t]*" "^[ \t]*#\\+res\\(ults\\|name\\)\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:[ \t]*"
"Regular expression used to match result lines. "Regular expression used to match result lines.
@ -892,20 +888,20 @@ may be specified in the properties of the current outline entry."
"Retrieve per-buffer parameters. "Retrieve per-buffer parameters.
Return an association list of any source block params which Return an association list of any source block params which
may be specified in the current buffer." may be specified in the current buffer."
(or org-babel-current-buffer-properties (let (local-properties)
(save-match-data (save-match-data
(save-excursion (save-excursion
(save-restriction (save-restriction
(widen) (widen)
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward (while (re-search-forward
(org-make-options-regexp (list "BABEL")) nil t) (org-make-options-regexp (list "BABEL" "PROPERTIES")) nil t)
(setq org-babel-current-buffer-properties (setq local-properties
(org-babel-merge-params (org-babel-merge-params
org-babel-current-buffer-properties local-properties
(org-babel-parse-header-arguments (org-babel-parse-header-arguments
(org-match-string-no-properties 2))))) (org-match-string-no-properties 2)))))
org-babel-current-buffer-properties))))) local-properties)))))
(defvar org-src-preserve-indentation) (defvar org-src-preserve-indentation)
(defun org-babel-parse-src-block-match () (defun org-babel-parse-src-block-match ()