merges r23837 from trunk into ruby_1_9_1.

--
* parse.y (parser_set_encode): show the erred file name instead of
  the file that requires it.  [ruby-core:24006]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 93e59bc639..06e9013d94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 24 15:02:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_set_encode): show the erred file name instead of
+	  the file that requires it.  [ruby-core:24006]
+
 Mon Jun 22 16:14:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (iseq_set_arguments, iseq_compile_each): internal