Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2012-12-13 23:47:39 +01:00
commit 6202df567c
2 changed files with 2 additions and 4 deletions

View File

@ -1019,8 +1019,7 @@ is non-nil."
(insert output) (insert output)
(goto-char (point-min)) (goto-char (point-min))
(LaTeX-mode) (LaTeX-mode)
(when org-export-show-temporary-export-buffer (org-export-add-to-stack (current-buffer) 'e-beamer)))
(org-export-add-to-stack (current-buffer) 'e-beamer))))
`(org-export-as 'e-beamer ,subtreep ,visible-only ,body-only `(org-export-as 'e-beamer ,subtreep ,visible-only ,body-only
',ext-plist)) ',ext-plist))
(let ((outbuf (org-export-to-buffer (let ((outbuf (org-export-to-buffer

View File

@ -2786,8 +2786,7 @@ is non-nil."
(insert output) (insert output)
(goto-char (point-min)) (goto-char (point-min))
(nxml-mode) (nxml-mode)
(when org-export-show-temporary-export-buffer (org-export-add-to-stack (current-buffer) 'e-html)))
(org-export-add-to-stack (current-buffer) 'e-html))))
`(org-export-as 'e-html ,subtreep ,visible-only ,body-only ',ext-plist)) `(org-export-as 'e-html ,subtreep ,visible-only ,body-only ',ext-plist))
(let ((outbuf (org-export-to-buffer (let ((outbuf (org-export-to-buffer
'e-html "*Org E-HTML Export*" 'e-html "*Org E-HTML Export*"