yugui	2011-05-31 09:13:03 +0900 (Tue, 31 May 2011)

  New Revision: 31841

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31841

  Log:
    merges r31747 and r31758 from trunk into ruby_1_9_2.
    --
    * io.c (fill_cbuf): finish reading at EOF.
    --
    * io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/io.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31840)
+++ ruby_1_9_2/ChangeLog	(revision 31841)
@@ -1,3 +1,11 @@
+Sat May 28 03:04:27 2011  NARUSE, Yui  <naruse@r...>
+
+	* io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty.
+
+Fri May 27 22:38:54 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (fill_cbuf): finish reading at EOF.
+
 Fri May 27 11:31:51 2011  misfo <tedwardo2@g...>
 
 	* lib/rexml/text.rb (REXML::Text#initialize): prevent an error
Index: ruby_1_9_2/io.c
===================================================================
--- ruby_1_9_2/io.c	(revision 31840)
+++ ruby_1_9_2/io.c	(revision 31841)
@@ -1694,10 +1694,15 @@
                     res = rb_econv_convert(fptr->readconv, NULL, NULL, &dp, de, 0);
                     fptr->cbuf_len += (int)(dp - ds);
                     rb_econv_check_error(fptr->readconv);
+                    break;
                 }
             }
         }
     }
+    if (cbuf_len0 != fptr->cbuf_len)
+	return MORE_CHAR_SUSPENDED;
+
+    return MORE_CHAR_FINISHED;
 }
 
 static VALUE
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31840)
+++ ruby_1_9_2/version.h	(revision 31841)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 258
+#define RUBY_PATCHLEVEL 259
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/