summaryrefslogtreecommitdiff
path: root/lib/coderay.rb
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-06-23 13:29:01 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-06-23 13:29:01 +0200
commit1d445c70edf8d5c878f9a830dcd29f5a3e179923 (patch)
tree75ad0b7db37981acd3bf54984353e70229e351ad /lib/coderay.rb
parentd9d6dd5f4a73363ea5d353ecda142f77ed4eba5a (diff)
parent1e330f16c21c45eff375ba3b12f966c76ba0b393 (diff)
downloadcoderay-1d445c70edf8d5c878f9a830dcd29f5a3e179923.tar.gz
Merge branch 'master' into upstream
Diffstat (limited to 'lib/coderay.rb')
-rw-r--r--lib/coderay.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/coderay.rb b/lib/coderay.rb
index 88c7cc2..24ae5a2 100644
--- a/lib/coderay.rb
+++ b/lib/coderay.rb
@@ -166,7 +166,6 @@ module CodeRay
#
# See also demo/demo_simple.
def scan code, lang, options = {}, &block
- # FIXME: return a proxy for direct-stream encoding
TokensProxy.new code, lang, options, block
end