2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 151e283dbf..49b1947270 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 11 10:43:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (load_file): the encoding of DATA follows the source
+	  file encoding. [ruby-dev:33693]
+
 Mon Feb 11 06:50:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/ruby/test_pack.rb: fix tests for 64bit CPU.
diff --git a/ruby.c b/ruby.c
index 1467fdfb23..f33096b9f0 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);
     }