mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-27 07:37:25 +00:00
Code

Correcting up cut/paste mistakes made in manual conflict resolution.

Browse Source
This commit is contained in:
Dan Davison 2009-07-17 00:50:02 -04:00
parent 64a5c0e379
commit 5d49db67ab
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/org-babel.el
View File

@ -307,15 +307,14 @@ of the following form. (language body header-arguments-alist)"
(goto-char (match-end 0)))))
(defun org-babel-parse-src-block-match ()
(defun org-babel-parse-inline-src-block-match ()
(let* ((lang (org-babel-clean-text-properties (match-string 1)))
(lang-headers (intern (concat "org-babel-default-header-args:" lang))))
(list (org-babel-clean-text-properties (match-string 1))
(org-babel-strip-protective-comas (org-babel-clean-text-properties (match-string 4)))
(org-babel-merge-params
org-babel-default-header-args
(if (boundp lang-headers) (eval lang-headers) nil)
(org-babel-parse-header-arguments (org-babel-clean-text-properties (or (match-string 3) "")))))))
(list lang
(org-babel-strip-protective-comas (org-babel-clean-text-properties (match-string 4)))
(org-babel-merge-params
org-babel-default-header-args
(if (boundp lang-headers) (eval lang-headers) nil)
(org-babel-parse-header-arguments (org-babel-clean-text-properties (or (match-string 3) "")))))))
(defun org-babel-parse-inline-src-block-match ()
(let* ((lang (org-babel-clean-text-properties (match-string 1)))