yugui	2008-12-04 17:54:37 +0900 (Thu, 04 Dec 2008)

  New Revision: 20497

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

  Log:
    merges r20458 and r20459 from trunk into ruby_1_9_1.
    * io.c (rb_io_getc, rb_io_readchar): documentation correction from
      Emiel van de Laar.  [ruby-core:20212]
    * ext/stringio/stringio.c (strio_ungetbyte): ditto.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/stringio/stringio.c
    branches/ruby_1_9_1/io.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20496)
+++ ruby_1_9_1/ChangeLog	(revision 20497)
@@ -1,3 +1,10 @@
+Wed Dec  3 12:24:08 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (rb_io_getc, rb_io_readchar): documentation correction from
+	  Emiel van de Laar.  [ruby-core:20212]
+
+	* ext/stringio/stringio.c (strio_readchar): ditto.
+
 Wed Dec  3 09:26:29 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/rexml/xpath.rb (REXML::XPath.first): apply documentation
Index: ruby_1_9_1/io.c
===================================================================
--- ruby_1_9_1/io.c	(revision 20496)
+++ ruby_1_9_1/io.c	(revision 20497)
@@ -2688,14 +2688,14 @@
 
 /*
  *  call-seq:
- *     ios.getc   => fixnum or nil
+ *     ios.getc   => string or nil
  *
  *  Reads a one-character string from <em>ios</em>. Returns
  *  <code>nil</code> if called at end of file.
  *
  *     f = File.new("testfile")
- *     f.getc   #=> "8"
- *     f.getc   #=> "1"
+ *     f.getc   #=> "h"
+ *     f.getc   #=> "e"
  */
 
 static VALUE
@@ -2720,8 +2720,8 @@
  *  <code>EOFError</code> on end of file.
  *
  *     f = File.new("testfile")
- *     f.readchar   #=> "8"
- *     f.readchar   #=> "1"
+ *     f.readchar   #=> "h"
+ *     f.readchar   #=> "e"
  */
 
 static VALUE
Index: ruby_1_9_1/ext/stringio/stringio.c
===================================================================
--- ruby_1_9_1/ext/stringio/stringio.c	(revision 20496)
+++ ruby_1_9_1/ext/stringio/stringio.c	(revision 20497)
@@ -749,7 +749,7 @@
 
 /*
  * call-seq:
- *   strio.readchar   -> fixnum
+ *   strio.readchar   -> string
  *
  * See IO#readchar.
  */

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