merges r21715 and r21718 from trunk into ruby_1_9_1.

* io.c (rb_io_ungetbyte, rb_io_ungetc): clears EOF flag.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 86a0832b6..d87ce2882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jan 21 21:43:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_ungetbyte, rb_io_ungetc): allows nil to reset EOF
+	  flag with ungetting nothing.
+
+	* ruby.c (load_file_internal): rests EOF flag to make possible to
+	  load from stdin after reading data.
+
+Wed Jan 21 15:32:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_ungetbyte, rb_io_ungetc): clears EOF flag.
+
 Wed Jan 21 13:58:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/io.h (FMODE_EOF): EOF flag on TTY.