diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-10 23:50:03 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-10 23:50:03 +0200 |
commit | 4540eb3ceb8882e28908073b20657b239ff2f878 (patch) | |
tree | 4d5d4f3a0f3929dfb8df7d3f2a318b1cac066a85 /bin/coderay | |
parent | 8ad02d8bde0515636a63247a74098b4d819b7950 (diff) | |
parent | a69d5d43b79a4f2cf5aaccc50b2275bf0dab4aba (diff) | |
download | coderay-4540eb3ceb8882e28908073b20657b239ff2f878.tar.gz |
Merge branch 'master' into javascript-keep-state
Diffstat (limited to 'bin/coderay')
-rwxr-xr-x | bin/coderay | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/coderay b/bin/coderay index d78cd57..9aecb88 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 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) |