diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-05-15 18:29:23 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-05-15 18:29:23 +0200 |
commit | 865ac0952b7ee07a2b57cc72c71e4024a0111609 (patch) | |
tree | 466ee7962595dbd866e66ad8828f1bb380ac1e12 | |
parent | 82066d1a0cfef759cc78167459f0b00aff4784bc (diff) | |
parent | 2c9f6fcef9dce2ace56e542f49f5f289dd741ce7 (diff) | |
download | org-mode-865ac0952b7ee07a2b57cc72c71e4024a0111609.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ox-html.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el index fc91e96..3ad3ffe 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -2679,12 +2679,14 @@ CONTENTS is nil. INFO is a plist holding contextual information." "Transcode an INLINE-SRC-BLOCK element from Org to HTML. CONTENTS holds the contents of the item. INFO is a plist holding contextual information." - (let ((lang (org-element-property :language inline-src-block)) - (code (org-element-property :value inline-src-block)) - (label - (let ((lbl (and (org-element-property :name inline-src-block) - (org-export-get-reference inline-src-block info)))) - (if (not lbl) "" (format " id=\"%s\"" lbl))))) + (let* ((lang (org-element-property :language inline-src-block)) + (code (org-html-fontify-code + (org-element-property :value inline-src-block) + lang)) + (label + (let ((lbl (and (org-element-property :name inline-src-block) + (org-export-get-reference inline-src-block info)))) + (if (not lbl) "" (format " id=\"%s\"" lbl))))) (format "<code class=\"src src-%s\"%s>%s</code>" lang label code))) ;;;; Inlinetask |