Merge pull request #418 from f279801/nolang_src

Fix crashing when source block has no language specified
This commit is contained in:
Yujie Wen 2020-04-27 23:40:46 +08:00 committed by GitHub
commit 16b1f4c307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 16 deletions

View File

@ -1008,11 +1008,10 @@ contextual information."
((string= lang "scheme") "selector_eval_scheme")
((string= lang "ruby") "selector_eval_ruby")
((string= lang "html") "selector_eval_html"))
)
)
))
(if (not lang)
(format "<pre %s%s%s>\n%s</pre>"
(or (frag-class src-block info) " class=\"example\""))
(format "<pre %s%s>\n%s</pre>"
(or (frag-class src-block info) " class=\"example\"")
label
code)
(if klipsify
@ -1041,18 +1040,18 @@ window.klipse_settings = { " langselector ": \".klipse\" };
'>
</iframe>")
(format
"<div class=\"org-src-container\">\n%s%s\n</div>"
(if (not caption) ""
(format "<label class=\"org-src-name\">%s</label>"
(org-export-data caption info)))
(if use-highlight
(format "\n<pre%s%s><code class=\"%s\" %s>%s</code></pre>"
(or (frag-class src-block info) "")
label lang code-attribs code)
(format "\n<pre %s%s><code trim>%s</code></pre>"
(or (frag-class src-block info)
(format " class=\"src src-%s\"" lang))
label code)))))))
"<div class=\"org-src-container\">\n%s%s\n</div>"
(if (not caption) ""
(format "<label class=\"org-src-name\">%s</label>"
(org-export-data caption info)))
(if use-highlight
(format "\n<pre%s%s><code class=\"%s\" %s>%s</code></pre>"
(or (frag-class src-block info) "")
label lang code-attribs code)
(format "\n<pre %s%s><code trim>%s</code></pre>"
(or (frag-class src-block info)
(format " class=\"src src-%s\"" lang))
label code))))))))
(defun org-reveal-quote-block (quote-block contents info)
"Transcode a QUOTE-BLOCK element from Org to Reveal.