mirror of https://github.com/yjwen/org-reveal.git
Fix wrong-type-argument error from REVEAL_PLUGINS header
This commit is contained in:
parent
f1c9d4a4c8
commit
69920273cb
19
ox-reveal.el
19
ox-reveal.el
|
@ -670,11 +670,12 @@ dependencies: [
|
||||||
(mapcar
|
(mapcar
|
||||||
(lambda (p)
|
(lambda (p)
|
||||||
(eval (plist-get builtins p)))
|
(eval (plist-get builtins p)))
|
||||||
(let ((buffer-plugins (plist-get info :reveal-plugins)))
|
(let ((buffer-plugins (condition-case e
|
||||||
(cond
|
(car (read-from-string (plist-get info :reveal-plugins)))
|
||||||
((string= buffer-plugins "") ())
|
(end-of-file nil)
|
||||||
(buffer-plugins (car (read-from-string buffer-plugins)))
|
(wrong-type-argument nil))))
|
||||||
(t org-reveal-plugins)))))
|
(or (and buffer-plugins (listp buffer-plugins) buffer-plugins)
|
||||||
|
org-reveal-plugins))))
|
||||||
(extra-codes (plist-get info :reveal-extra-js))
|
(extra-codes (plist-get info :reveal-extra-js))
|
||||||
(total-codes
|
(total-codes
|
||||||
(if (string= "" extra-codes) builtin-codes
|
(if (string= "" extra-codes) builtin-codes
|
||||||
|
@ -887,8 +888,12 @@ holding contextual information."
|
||||||
|
|
||||||
(defun org-reveal--using-highlight.js (info)
|
(defun org-reveal--using-highlight.js (info)
|
||||||
"Check whether highlight.js plugin is enabled."
|
"Check whether highlight.js plugin is enabled."
|
||||||
(memq 'highlight (or (car (read-from-string (plist-get info :reveal-plugins)))
|
(let ((reveal-plugins (condition-case e
|
||||||
org-reveal-plugins)))
|
(car (read-from-string (plist-get info :reveal-plugins)))
|
||||||
|
(end-of-file nil)
|
||||||
|
(wrong-type-argument nil))))
|
||||||
|
(memq 'highlight (or (and reveal-plugins (listp reveal-plugins) reveal-plugins)
|
||||||
|
org-reveal-plugins))))
|
||||||
|
|
||||||
(defun org-reveal-src-block (src-block contents info)
|
(defun org-reveal-src-block (src-block contents info)
|
||||||
"Transcode a SRC-BLOCK element from Org to Reveal.
|
"Transcode a SRC-BLOCK element from Org to Reveal.
|
||||||
|
|
Loading…
Reference in New Issue