summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2011-10-20 13:31:20 -0600
committerEric Schulte <schulte.eric@gmail.com>2011-10-20 13:42:31 -0600
commit04a978fde525a442f9de14d1a67783edd5c9cb78 (patch)
treefd36f855ca36398eee9e25c4d0fc279656219aba
parenta17ceed1cc300c4b3891739066aeb01418bbcd06 (diff)
downloadorg-mode-04a978fde525a442f9de14d1a67783edd5c9cb78.tar.gz
removing #+BABEL: lines in favor of general #+PROPERTIES: lines
* lisp/ob.el (org-babel-params-from-buffer): Removing #+BABEL: lines in favor of general #+PROPERTIES: lines. * doc/org.texi (Buffer-wide header arguments): Removing documentation of the defunct #+BABEL: structure.
-rw-r--r--doc/org.texi7
-rw-r--r--lisp/ob.el2
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/org.texi b/doc/org.texi
index be26817..2b2a637 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -12040,9 +12040,10 @@ language-specific documentation available online at
@node Buffer-wide header arguments, Header arguments in Org-mode properties, Language-specific header arguments, Using header arguments
@subsubheading Buffer-wide header arguments
-Buffer-wide header arguments may be specified through the use of a special
+Buffer-wide header arguments may be specified through the use of a
+@code{#+PROPERTIES:}
line placed anywhere in an Org-mode file. The line consists of the
-@code{#+BABEL:} keyword followed by a series of header arguments which may be
+@code{#+PROPERTIES:} keyword followed by a series of header arguments which may be
specified using the standard header argument syntax.
For example the following would set @code{session} to @code{*R*}, and
@@ -12051,7 +12052,7 @@ that all execution took place in the same session, and no results would be
inserted into the buffer.
@example
-#+BABEL: :session *R* :results silent
+#+PROPERTIES: :session *R* :results silent
@end example
@node Header arguments in Org-mode properties, Code block specific header arguments, Buffer-wide header arguments, Using header arguments
diff --git a/lisp/ob.el b/lisp/ob.el
index 0778fe0..251e2cb 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -1072,7 +1072,7 @@ may be specified in the current buffer."
(widen)
(goto-char (point-min))
(while (re-search-forward
- (org-make-options-regexp (list "BABEL" "PROPERTIES")) nil t)
+ (org-make-options-regexp '("PROPERTIES")) nil t)
(setq local-properties
(org-babel-merge-params
local-properties