summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-02-23 14:37:43 +0100
committerBastien Guerry <bzg@altern.org>2013-02-23 14:37:43 +0100
commitb2e38cb030bc8c2c7927ed6a2226bb99b2e3fc17 (patch)
tree88ce2f728d6c3f25ed9ffe94039887964591191b
parent8900b27fc80b6754ee32ca87b31440dad340d2b5 (diff)
parent57fb6ffa4ddb248a30a883bc20475f0dc5e37b27 (diff)
downloadorg-mode-b2e38cb030bc8c2c7927ed6a2226bb99b2e3fc17.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--lisp/ox-latex.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index e4b0dcf..4ab5be2 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -952,7 +952,7 @@ when specified inputenc option is \"AUTO\".
Return the new header, as a string."
(let* ((cs (or (ignore-errors
(latexenc-coding-system-to-inputenc
- buffer-file-coding-system))
+ (or org-export-coding-system buffer-file-coding-system)))
"utf8")))
(if (not cs) header
;; First translate if that is requested.