summaryrefslogtreecommitdiffstats
path: root/ruby.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-11 01:47:26 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-11 01:47:26 +0000
commit69002ff0b5cd4fdb2321b80f19961a94ec189c3a (patch)
tree7eec163a593f011b1cfe6511da5ad09c335f6f71 /ruby.c
parent04383f8347519cc6f5566c998dfa83981c30d0a5 (diff)
downloadruby-69002ff0b5cd4fdb2321b80f19961a94ec189c3a.tar.gz
ruby-69002ff0b5cd4fdb2321b80f19961a94ec189c3a.tar.xz
ruby-69002ff0b5cd4fdb2321b80f19961a94ec189c3a.zip
* ruby.c (load_file): the encoding of DATA follows the source
file encoding. [ruby-dev:33693] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby.c b/ruby.c
index 1467fdfb2..f33096b9f 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1192,8 +1192,8 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
else {
enc = rb_usascii_encoding();
}
- rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc));
tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start);
+ rb_funcall(f, rb_intern("set_encoding"), 1, rb_parser_encoding(parser));
if (script && rb_parser_end_seen_p(parser)) {
rb_define_global_const("DATA", f);
}