summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus <rasmus@gmx.us>2016-05-23 08:59:29 +0200
committerRasmus <rasmus@gmx.us>2016-05-23 08:59:29 +0200
commit42bc27b473b58887d5fe71cb149ed9548725435e (patch)
tree8190744ec238e640da6b222b71affd726a0fc4ab
parent3c729c7c0b12ca03461917fc0d527be687902603 (diff)
parent8c968a9697580361ff19159bab60df132ab1bbd5 (diff)
downloadorg-mode-42bc27b473b58887d5fe71cb149ed9548725435e.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-latex.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 9c31645..f8ee621 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1338,8 +1338,8 @@ Return the new header."
header
(let ((options (save-match-data
(org-split-string (match-string 1 header) ",[ \t]*")))
- (language (cdr (assoc language-code
- org-latex-babel-language-alist))))
+ (language (cdr (assoc-string language-code
+ org-latex-babel-language-alist t))))
;; If LANGUAGE is already loaded, return header without AUTO.
;; Otherwise, replace AUTO with language or append language if
;; AUTO is not present.
@@ -1540,7 +1540,7 @@ INFO is a plist used as a communication channel."
"Create a format-spec for document meta-data.
INFO is a plist used as a communication channel."
(let ((language (let ((lang (plist-get info :language)))
- (or (cdr (assoc lang org-latex-babel-language-alist))
+ (or (cdr (assoc-string lang org-latex-babel-language-alist t))
lang))))
`((?a . ,(org-export-data (plist-get info :author) info))
(?t . ,(org-export-data (plist-get info :title) info))