merge revision(s) 34576:

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index f7319eb680..089a73d3df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 13 12:06:29 2012  Loren Segal  <lsegal@soen.ca>
+
+	* 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@iDaemons.org>
 
 	* misc/rdoc-mode.el (rdoc-imenu-create-index): Add imenu support
diff --git a/io.c b/io.c
index cbe2bff2c4..1e8fb95c61 100644
--- a/io.c
+++ b/io.c
@@ -10898,10 +10898,11 @@ Init_IO(void)
     /* 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);
diff --git a/version.h b/version.h
index 624581770e..95b74bd521 100644
--- a/version.h
+++ b/version.h
@@ -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"