From 5d49db67ab5619b8b83f71ee8551b66984ac181a Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Fri, 17 Jul 2009 00:50:02 -0400 Subject: [PATCH] Correcting up cut/paste mistakes made in manual conflict resolution. --- lisp/org-babel.el | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lisp/org-babel.el b/lisp/org-babel.el index 4e84a0b42..60c60b376 100644 --- a/lisp/org-babel.el +++ b/lisp/org-babel.el @@ -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)))