From d5d8608a970d450ecf70710f04c9f420754aea81 Mon Sep 17 00:00:00 2001
From: Eric Schulte <schulte.eric@gmail.com>
Date: Sat, 12 Sep 2009 12:14:09 -0600
Subject: [PATCH] now respects the properties on export

---
 contrib/babel/lisp/org-babel-exp.el | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/contrib/babel/lisp/org-babel-exp.el b/contrib/babel/lisp/org-babel-exp.el
index 6e74b922d..c79bdd80e 100644
--- a/contrib/babel/lisp/org-babel-exp.el
+++ b/contrib/babel/lisp/org-babel-exp.el
@@ -54,8 +54,8 @@ none ----- do not display either code or results upon export"
          (lang-headers (intern (concat "org-babel-default-header-args:" lang)))
          (params (org-babel-merge-params
                   org-babel-default-header-args
-                  (org-babel-params-from-properties)
                   (if (boundp lang-headers) (eval lang-headers) nil)
+                  (org-babel-params-from-properties)
                   (org-babel-parse-header-arguments
                    (mapconcat #'identity (cdr headers) " ")))))
     (org-babel-exp-do-export lang body params)))
@@ -79,13 +79,10 @@ options and are taken from `org-babel-defualt-inline-header-args'."
   (case (intern (or (cdr (assoc :exports params)) "code"))
     ('none "")
     ('code (org-babel-exp-code body lang params inline))
-    ('results (save-excursion
-                ;; org-exp-blocks places us at the end of the block
-                (re-search-backward org-babel-src-block-regexp nil t)
-                (org-babel-execute-src-block) ""))
+    ('results (org-babel-exp-results))
     ('both (concat (org-babel-exp-code body lang params inline)
                    "\n\n"
-                   (org-babel-exp-results body lang params inline)))))
+                   (org-babel-exp-results)))))
 
 (defun org-babel-exp-code (body lang params &optional inline)
   (if inline
@@ -93,5 +90,11 @@ options and are taken from `org-babel-defualt-inline-header-args'."
     (format "#+BEGIN_SRC %s\n%s%s\n#+END_SRC" lang body
             (if (string-match "\n$" body) "" "\n"))))
 
+(defun org-babel-exp-results ()
+  (save-excursion
+    ;; org-exp-blocks places us at the end of the block
+    (re-search-backward org-babel-src-block-regexp nil t)
+    (org-babel-execute-src-block) ""))
+
 (provide 'org-babel-exp)
 ;;; org-babel-exp.el ends here
-- 
2.11.4.GIT