From 40ce6b75e6245659a3a14622356e32e7dd1125dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Sun, 13 Jul 2014 13:35:29 +0200 Subject: Imported Upstream version 8.2.1 --- lisp/ox-org.el | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'lisp/ox-org.el') diff --git a/lisp/ox-org.el b/lisp/ox-org.el index 7539317..644cc0d 100644 --- a/lisp/ox-org.el +++ b/lisp/ox-org.el @@ -172,22 +172,8 @@ Export is done in a buffer named \"*Org ORG Export*\", which will be displayed when `org-export-show-temporary-export-buffer' is non-nil." (interactive) - (if async - (org-export-async-start - (lambda (output) - (with-current-buffer (get-buffer-create "*Org ORG Export*") - (erase-buffer) - (insert output) - (goto-char (point-min)) - (org-mode) - (org-export-add-to-stack (current-buffer) 'org))) - `(org-export-as 'org ,subtreep ,visible-only nil ',ext-plist)) - (let ((outbuf - (org-export-to-buffer - 'org "*Org ORG Export*" subtreep visible-only nil ext-plist))) - (with-current-buffer outbuf (org-mode)) - (when org-export-show-temporary-export-buffer - (switch-to-buffer-other-window outbuf))))) + (org-export-to-buffer 'org "*Org ORG Export*" + async subtreep visible-only nil ext-plist (lambda () (org-mode)))) ;;;###autoload (defun org-org-export-to-org (&optional async subtreep visible-only ext-plist) @@ -216,13 +202,8 @@ file-local settings. Return output file name." (interactive) (let ((outfile (org-export-output-file-name ".org" subtreep))) - (if async - (org-export-async-start - (lambda (f) (org-export-add-to-stack f 'org)) - `(expand-file-name - (org-export-to-file - 'org ,outfile ,subtreep ,visible-only nil ',ext-plist))) - (org-export-to-file 'org outfile subtreep visible-only nil ext-plist)))) + (org-export-to-file 'org outfile + async subtreep visible-only nil ext-plist))) ;;;###autoload (defun org-org-publish-to-org (plist filename pub-dir) -- cgit v1.2.3