nobu	2012-02-13 12:06:52 +0900 (Mon, 13 Feb 2012)

  New Revision: 34578

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

  Log:
    merge revision(s) 34576:
    
    * io.c (Init_IO): use directive hack to make ARGF documentable
      in other tools.  [ruby-core:42515][Bug #6007]

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

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34577)
+++ ruby_1_9_3/ChangeLog	(revision 34578)
@@ -1,3 +1,8 @@
+Mon Feb 13 12:06:29 2012  Loren Segal  <lsegal@s...>
+
+	* io.c (Init_IO): use directive hack to make ARGF documentable
+	  in other tools.  [ruby-core:42515][Bug #6007]
+
 Sun Feb 12 16:57:56 2012  Akinori MUSHA  <knu@i...>
 
 	* misc/rdoc-mode.el (rdoc-imenu-create-index): Add imenu support
Index: ruby_1_9_3/io.c
===================================================================
--- ruby_1_9_3/io.c	(revision 34577)
+++ ruby_1_9_3/io.c	(revision 34578)
@@ -10898,10 +10898,11 @@
     /* Holds the original stderr */
     rb_define_global_const("STDERR", rb_stderr);
 
-    /*
-     * Hack to get rdoc to regard ARGF as a class:
-     * rb_cARGF = rb_define_class("ARGF", rb_cObject);
-     */
+#if 0
+    /* Hack to get rdoc to regard ARGF as a class: */
+    rb_cARGF = rb_define_class("ARGF", rb_cObject);
+#endif
+
     rb_cARGF = rb_class_new(rb_cObject);
     rb_set_class_path(rb_cARGF, rb_cObject, "ARGF.class");
     rb_define_alloc_func(rb_cARGF, argf_alloc);
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34577)
+++ ruby_1_9_3/version.h	(revision 34578)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 103
+#define RUBY_PATCHLEVEL 104
 
-#define RUBY_RELEASE_DATE "2012-02-12"
+#define RUBY_RELEASE_DATE "2012-02-13"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
 
 #include "ruby/version.h"
 

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