summaryrefslogtreecommitdiff
path: root/lib/coderay.rb
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2011-09-18 22:28:20 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2011-09-18 22:28:20 +0200
commit14b4728342af152f865f29e67d583c733e912756 (patch)
tree011fd602f03bde0686d00da3bbc9a1695037c3e2 /lib/coderay.rb
parenta6b256219d84022fc518d620b210754b5f8ccce4 (diff)
parenta06a8df6cb85527a4ace6d4781ab421afcc62073 (diff)
downloadcoderay-14b4728342af152f865f29e67d583c733e912756.tar.gz
Merge branch 'master' into tokens-proxy
Diffstat (limited to 'lib/coderay.rb')
-rw-r--r--lib/coderay.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay.rb b/lib/coderay.rb
index c8bc1e4..c897220 100644
--- a/lib/coderay.rb
+++ b/lib/coderay.rb
@@ -177,7 +177,7 @@ module CodeRay
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.