diff --git a/ChangeLog b/ChangeLog index 7b857e9e1c..a783cdc93f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 12 10:15:14 2008 NARUSE, Yui + + * ruby.c (load_file): enc must effect source encoding. + [ruby-core#15496] + Tue Feb 12 10:16:47 2008 Eric Hodel * lib/rdoc/ri/paths.rb: Restore require rubygems check. diff --git a/ruby.c b/ruby.c index f33096b9f0..5138e0841c 100644 --- a/ruby.c +++ b/ruby.c @@ -1192,6 +1192,7 @@ 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)) {