diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-12 16:04:45 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-12 16:04:45 +0200 |
| commit | 69246fc8ed0344eae4dab35286813a00010a08cb (patch) | |
| tree | 9c4faf0bcc2bb53e7955aff0b139492ea04dbe2e /bin | |
| parent | 34e823d709ce19a480dbd78e72e63ada0d3425fb (diff) | |
| parent | 40bd2ef5d33d32c3b3987da1d115b717259819e4 (diff) | |
| download | coderay-69246fc8ed0344eae4dab35286813a00010a08cb.tar.gz | |
Merge branch 'master' into lua-scanner
Conflicts:
lib/coderay/token_kinds.rb
Diffstat (limited to 'bin')
| -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) |