diff --git a/ChangeLog b/ChangeLog
index 1db25a78e9..205e255318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 13 18:15:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (swallow): should use more_char() instead of fill_cbuf().
+	  suggested by akr.
+
 Thu May 13 17:56:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/io/console/console.c (console_set_echo, console_echo_p): use
diff --git a/io.c b/io.c
index 4c481e59a6..985d65ae51 100644
--- a/io.c
+++ b/io.c
@@ -2296,7 +2296,6 @@ swallow(rb_io_t *fptr, int term)
     if (NEED_READCONV(fptr)) {
 	rb_encoding *enc = io_read_encoding(fptr);
 	int needconv = rb_enc_mbminlen(enc) != 1;
-	VALUE v;
 	make_readconv(fptr, 0);
 	do {
 	    size_t cnt;
@@ -2315,10 +2314,7 @@ swallow(rb_io_t *fptr, int term)
 		}
 		io_shift_cbuf(fptr, (int)cnt - i, NULL);
 	    }
-	    v = fill_cbuf(fptr, 0);
-	    if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED)
-		rb_exc_raise(v);
-	} while (v == MORE_CHAR_SUSPENDED);
+	} while (more_char(fptr) != MORE_CHAR_FINISHED);
 	return FALSE;
     }