summaryrefslogtreecommitdiff
path: root/bin/coderay
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-06-11 18:10:54 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-06-11 18:10:54 +0200
commit916711c9983483c39f9a68c29e21a0ed40004bd2 (patch)
treea3a98ac92db67a75625525b4d559b7db7ac89965 /bin/coderay
parent0c98047ea276f393daa8249cf9c124ebc08266d2 (diff)
parent2e4e83bf84282d6ce7fbc9eeff2cbe1c79788a9b (diff)
downloadcoderay-916711c9983483c39f9a68c29e21a0ed40004bd2.tar.gz
Merge branch 'master' into paint-integration
Diffstat (limited to 'bin/coderay')
-rwxr-xr-xbin/coderay3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/coderay b/bin/coderay
index fcf5ec4..3dea528 100755
--- a/bin/coderay
+++ b/bin/coderay
@@ -125,7 +125,7 @@ when 'highlight', nil
end
if output_file
- output_format ||= CodeRay::FileType[output_file]
+ output_format ||= CodeRay::FileType[output_file] || :plain
else
output_format ||= :terminal_256
end
@@ -143,7 +143,6 @@ when 'highlight', nil
if output_file
File.open output_file, 'w'
else
- $stdout.sync = true
$stdout
end
CodeRay.encode(input, input_lang, output_format, :out => file)