diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-30 09:17:49 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-30 09:17:49 +0000 |
commit | 86c50e39838fc5831163e3b92a9047d539fb46ee (patch) | |
tree | e3657bdbdd43464542b124d616b93bb7bee1adfd /ruby.c | |
parent | 9767736b40b6dec88c5859784e1bbea5d4c43deb (diff) | |
download | bundler-86c50e39838fc5831163e3b92a9047d539fb46ee.tar.gz |
* ruby.c (load_file_internal): should not set script encoding to
ASCII-8BIT.
* ruby.c (load_file_internal): do not auto convert scripts even
when default_internal is set. [ruby-core:19579]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1381,9 +1381,9 @@ load_file_internal(VALUE arg) enc = rb_locale_encoding(); } else { - enc = rb_ascii8bit_encoding(); + enc = rb_usascii_encoding(); } - rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc)); + rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-")); tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start); rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser)); if (script && rb_parser_end_seen_p(parser)) { |