Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2014-04-06 19:59:13 +02:00
commit 798bb8d42f

View file

@ -1573,7 +1573,7 @@ contextual information."
(let* ((org-lang (org-element-property :language inline-src-block)) (let* ((org-lang (org-element-property :language inline-src-block))
(mint-lang (or (cadr (assq (intern org-lang) (mint-lang (or (cadr (assq (intern org-lang)
org-latex-minted-langs)) org-latex-minted-langs))
org-lang)) (downcase org-lang)))
(options (org-latex--make-option-string (options (org-latex--make-option-string
org-latex-minted-options))) org-latex-minted-options)))
(concat (format "\\mint%s{%s}" (concat (format "\\mint%s{%s}"
@ -2310,7 +2310,8 @@ contextual information."
(let ((local-options (plist-get attributes :options))) (let ((local-options (plist-get attributes :options)))
(and local-options (concat "," local-options)))) (and local-options (concat "," local-options))))
;; Language. ;; Language.
(or (cadr (assq (intern lang) org-latex-minted-langs)) lang) (or (cadr (assq (intern lang) org-latex-minted-langs))
(downcase lang))
;; Source code. ;; Source code.
(let* ((code-info (org-export-unravel-code src-block)) (let* ((code-info (org-export-unravel-code src-block))
(max-width (max-width