emacs
/
org-reveal
mirror of https://github.com/yjwen/org-reveal.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix wrong-type-argument error from REVEAL_PLUGINS header

This commit is contained in:
Yunsik Jang 2015-11-04 15:31:40 +09:00
parent f1c9d4a4c8
commit 69920273cb
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ox-reveal.el
View File

@ -670,11 +670,12 @@ dependencies: [
(mapcar
(lambda (p)
(eval (plist-get builtins p)))
(let ((buffer-plugins (plist-get info :reveal-plugins)))
(cond
((string= buffer-plugins "") ())
(buffer-plugins (car (read-from-string buffer-plugins)))
(t org-reveal-plugins)))))
(let ((buffer-plugins (condition-case e
(car (read-from-string (plist-get info :reveal-plugins)))
(end-of-file nil)
(wrong-type-argument nil))))
(or (and buffer-plugins (listp buffer-plugins) buffer-plugins)
org-reveal-plugins))))
(extra-codes (plist-get info :reveal-extra-js))
(total-codes
(if (string= "" extra-codes) builtin-codes
@ -887,8 +888,12 @@ holding contextual information."
(defun org-reveal--using-highlight.js (info)
"Check whether highlight.js plugin is enabled."
(memq 'highlight (or (car (read-from-string (plist-get info :reveal-plugins)))
org-reveal-plugins)))
(let ((reveal-plugins (condition-case e
(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)
"Transcode a SRC-BLOCK element from Org to Reveal.