mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-03-08 11:48:56 +01:00
parent 2f48603d71 2eda74285e
commit 6747bf3de6
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/ox-beamer.el
View File

@ -1122,9 +1122,13 @@ Return output file name."
;; working directory and then moved to publishing directory.
(org-publish-attachment
plist
(org-latex-compile
(org-publish-org-to
'beamer filename ".tex" plist (file-name-directory filename)))
;; Default directory could be anywhere when this function is
;; called. We ensure it is set to source file directory during
;; compilation so as to not break links to external documents.
(let ((default-directory (file-name-directory filename)))
(org-latex-compile
(org-publish-org-to
'beamer filename ".tex" plist (file-name-directory filename))))
pub-dir))

10
lisp/ox-latex.el
View File

@ -3696,9 +3696,13 @@ Return output file name."
;; in working directory and then moved to publishing directory.
(org-publish-attachment
plist
(org-latex-compile
(org-publish-org-to
'latex filename ".tex" plist (file-name-directory filename)))
;; Default directory could be anywhere when this function is
;; called. We ensure it is set to source file directory during
;; compilation so as to not break links to external documents.
(let ((default-directory (file-name-directory filename)))
(org-latex-compile
(org-publish-org-to
'latex filename ".tex" plist (file-name-directory filename))))
pub-dir))