소스 검색

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.
Eric Schulte 13 년 전
부모
커밋
080e2decbc
3개의 변경된 파일0개의 추가작업 그리고 24개의 파일을 삭제
  1. 0 2
      lisp/ob-exp.el
  2. 0 1
      lisp/ob-lob.el
  3. 0 21
      lisp/ob.el

+ 0 - 2
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

+ 0 - 1
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

+ 0 - 21
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