Merge branch 'master' into go-scanner

Conflicts:
	lib/coderay/helpers/file_type.rb

1 files changed, 3 insertions, 2 deletions

diff --git a/bin/coderay b/bin/coderay
index 9aecb88..889ae72 100755
--- a/bin/coderay
+++ b/bin/coderay
@@ -155,8 +155,9 @@ when 'highlight', nil
         puts boom.message
       end
       # puts "I don't know this plugin: #{boom.message[/Could not load plugin (.*?): /, 1]}."
-    rescue CodeRay::Scanners::Scanner::ScanError  # FIXME: rescue Errno::EPIPE
-      # this is sometimes raised by pagers; ignore [TODO: wtf?]
+    rescue CodeRay::Scanners::Scanner::ScanError
+      # this is sometimes raised by pagers; ignore
+    # FIXME: rescue Errno::EPIPE
     ensure
       file.close if output_file
     end