summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2011-10-20 15:26:43 -0600
committerEric Schulte <schulte.eric@gmail.com>2011-10-20 15:26:43 -0600
commit080e2decbc22ad872b02bd564a173051a65599ff (patch)
tree1617a6859375da4e39aab7a70947988fd5ade894
parent04a978fde525a442f9de14d1a67783edd5c9cb78 (diff)
downloadorg-mode-080e2decbc22ad872b02bd564a173051a65599ff.tar.gz
removing `org-babel-params-from-buffer' and #+PROPERTIES: entirely
* lisp/ob.el: Removing `org-babel-params-from-buffer' and #+PROPERTIES: entirely. * lisp/ob-exp.el (org-babel-exp-src-block): Removing `org-babel-params-from-buffer' and #+PROPERTIES: entirely. * lisp/ob-lob.el (org-babel-lob-execute): Removing `org-babel-params-from-buffer' and #+PROPERTIES: entirely.
-rw-r--r--lisp/ob-exp.el2
-rw-r--r--lisp/ob-lob.el1
-rw-r--r--lisp/ob.el21
3 files changed, 0 insertions, 24 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index c6ae85f..3b102e1 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -105,7 +105,6 @@ none ----- do not display either code or results upon export"
(org-babel-process-params
(org-babel-merge-params
org-babel-default-header-args
- (org-babel-params-from-buffer)
(org-babel-params-from-properties lang)
(if (boundp lang-headers) (eval lang-headers) nil)
raw-params))))
@@ -197,7 +196,6 @@ options are taken from `org-babel-default-header-args'."
(org-babel-merge-params
org-babel-default-header-args
org-babel-default-lob-header-args
- (org-babel-params-from-buffer)
(org-babel-params-from-properties)
(org-babel-parse-header-arguments
(org-babel-clean-text-properties
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el
index 307e237..be3033e 100644
--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@@ -125,7 +125,6 @@ if so then run the appropriate source block from the Library."
(let ((params (org-babel-process-params
(org-babel-merge-params
org-babel-default-header-args
- (org-babel-params-from-buffer)
(org-babel-params-from-properties)
(org-babel-parse-header-arguments
(org-babel-clean-text-properties
diff --git a/lisp/ob.el b/lisp/ob.el
index 251e2cb..f954e7b 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -1061,25 +1061,6 @@ may be specified in the properties of the current outline entry."
(setq sym (intern (concat "org-babel-header-arg-names:" lang)))
(and (boundp sym) (eval sym))))))))))
-(defun org-babel-params-from-buffer ()
- "Retrieve per-buffer parameters.
- Return an association list of any source block params which
-may be specified in the current buffer."
- (let (local-properties)
- (save-match-data
- (save-excursion
- (save-restriction
- (widen)
- (goto-char (point-min))
- (while (re-search-forward
- (org-make-options-regexp '("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 ()
"Parse the results from a match of the `org-babel-src-block-regexp'."
@@ -1105,7 +1086,6 @@ may be specified in the current buffer."
(buffer-string)))
(org-babel-merge-params
org-babel-default-header-args
- (org-babel-params-from-buffer)
(org-babel-params-from-properties lang)
(if (boundp lang-headers) (eval lang-headers) nil)
(org-babel-parse-header-arguments
@@ -1122,7 +1102,6 @@ may be specified in the current buffer."
(org-babel-clean-text-properties (match-string 5)))
(org-babel-merge-params
org-babel-default-inline-header-args
- (org-babel-params-from-buffer)
(org-babel-params-from-properties lang)
(if (boundp lang-headers) (eval lang-headers) nil)
(org-babel-parse-header-arguments