merges r24227 from trunk into ruby_1_9_1.

--
 * lib/irb/cmd/help.rb: fixed irb's "help" command. [ruby-core:22310].

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@26019 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 39d42f16a..44a78f73c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 21 21:37:19 2009  Keiju Ishitsuka  <keiju@emperor2.pendome>
+
+	* lib/irb/cmd/help.rb: fixed irb's "help" command. [ruby-core:22310].
+
 Thu Jul 23 14:35:02 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_{open,wopen}): fixed typos. these conditions
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
index e1f47e2c9..1e600a6cd 100644
--- a/lib/irb/cmd/help.rb
+++ b/lib/irb/cmd/help.rb
@@ -11,17 +11,19 @@
 require 'rdoc/ri/driver'
 require 'rdoc/ri/util'
 
+require "irb/cmd/nop.rb"
+
 module IRB
   module ExtendCommand
-    module Help
+    class Help<Nop
       begin
-        @ri = RDoc::RI::Driver.new
+        Ri = RDoc::RI::Driver.new
       rescue SystemExit
       else
-        def self.execute(context, *names)
+        def execute(*names)
           names.each do |name|
             begin
-              @ri.get_info_for(name.to_s)
+              Ri.get_info_for(name.to_s)
             rescue RDoc::RI::Error
               puts $!.message
             end
diff --git a/version.h b/version.h
index c4bd3ac3c..3cfe8becd 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 372
+#define RUBY_PATCHLEVEL 373
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1