From 60864e851bbd67751299877de4a368c8a78e9824 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Thu, 14 Apr 2011 20:37:21 -0600 Subject: [PATCH] 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. --- lisp/ob.el | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/lisp/ob.el b/lisp/ob.el index e39322fd0..82722f9a0 100644 --- a/lisp/ob.el +++ b/lisp/ob.el @@ -306,10 +306,6 @@ specific header arguments as well.") '((:session . "none") (:results . "replace") (:exports . "results")) "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 "^[ \t]*#\\+res\\(ults\\|name\\)\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:[ \t]*" "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. Return an association list of any source block params which may be specified in the current buffer." - (or org-babel-current-buffer-properties - (save-match-data - (save-excursion - (save-restriction - (widen) - (goto-char (point-min)) - (while (re-search-forward - (org-make-options-regexp (list "BABEL")) nil t) - (setq org-babel-current-buffer-properties - (org-babel-merge-params - org-babel-current-buffer-properties - (org-babel-parse-header-arguments - (org-match-string-no-properties 2))))) - org-babel-current-buffer-properties))))) + (let (local-properties) + (save-match-data + (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (while (re-search-forward + (org-make-options-regexp (list "BABEL" "PROPERTIES")) nil t) + (setq local-properties + (org-babel-merge-params + local-properties + (org-babel-parse-header-arguments + (org-match-string-no-properties 2))))) + local-properties))))) (defvar org-src-preserve-indentation) (defun org-babel-parse-src-block-match ()