diff --git a/ChangeLog b/ChangeLog
index 3d123bdde3..5527553edd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep  1 09:32:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex::getc): should not push nil into
+	  reading buffer (@readed).  reported in
+	  <http://jarp.does.notwork.org/diary/200608c.html#200608311>.
+
 Thu Aug 31 23:59:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): follow nil.to_s.
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index ab584d5253..d8442f305b 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -104,6 +104,7 @@ class RubyLex
       @rests.push nil unless buf_input
     end
     c = @rests.shift
+    return if c == nil
     if @here_header
       @here_readed.push c
     else
@@ -234,7 +235,6 @@ class RubyLex
 	  unless l = lex
 	    throw :TERM_INPUT if @line == ''
 	  else
-	    #p l
 	    @line.concat l
 	    if @ltype or @continue or @indent > 0
 	      next