Merge branch 'bug/markdownSetOptions' of https://github.com/snowyu/reveal.js into dev

1 files changed, 2 insertions, 2 deletions

diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index ad596bf..124aa75 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -23,8 +23,8 @@
 
 	if( typeof hljs !== 'undefined' ) {
 		marked.setOptions({
-			highlight: function( lang, code ) {
-				return hljs.highlightAuto( lang, code ).value;
+			highlight: function( code, lang ) {
+				return hljs.highlightAuto( code, [lang] ).value;
 			}
 		});
 	}