Merge branch 'master' into tokens-proxy

korny · korny · commit 14b4728342af · 2011-09-18T22:28:20.000+02:00
diff --git a/lib/coderay.rb b/lib/coderay.rb
@@ -177,7 +177,7 @@ def scan code, lang, options = {}, &block
     def scan_file filename, lang = :auto, options = {}, &block
       lang = FileType.fetch filename, :text, true if lang == :auto
       code = File.read filename
-      scan code, lang, options = {}, &block
+      scan code, lang, options, &block
     end
     
     # Encode a string.
