summaryrefslogtreecommitdiff
path: root/lisp/ob-org.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ob-org.el')
-rw-r--r--lisp/ob-org.el13
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index 64de4b2..18cce3b 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -1,6 +1,6 @@
;;; ob-org.el --- org-babel functions for org code block evaluation
-;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -29,7 +29,8 @@
;;; Code:
(require 'ob)
-(declare-function org-export-string "org-exp" (string fmt &optional dir))
+(declare-function org-export-string-as "ox"
+ (string backend &optional body-only ext-plist))
(defvar org-babel-default-header-args:org
'((:results . "raw silent") (:exports . "code"))
@@ -53,10 +54,10 @@ This function is called by `org-babel-execute-src-block'."
(body (org-babel-expand-body:org
(replace-regexp-in-string "^," "" body) params)))
(cond
- ((member "latex" result-params) (org-export-string
- (concat "#+Title: \n" body) "latex"))
- ((member "html" result-params) (org-export-string body "html"))
- ((member "ascii" result-params) (org-export-string body "ascii"))
+ ((member "latex" result-params)
+ (org-export-string-as (concat "#+Title: \n" body) 'latex t))
+ ((member "html" result-params) (org-export-string-as body 'html t))
+ ((member "ascii" result-params) (org-export-string-as body 'ascii t))
(t body))))
(defun org-babel-prep-session:org (session params)