yugui	2009-12-05 18:41:03 +0900 (Sat, 05 Dec 2009)

  New Revision: 26019

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

  Log:
    merges r24227 from trunk into ruby_1_9_1.
    --
     * lib/irb/cmd/help.rb: fixed irb's "help" command. [ruby-core:22310].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/irb/cmd/help.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26018)
+++ ruby_1_9_1/ChangeLog	(revision 26019)
@@ -1,3 +1,7 @@
+Tue Jul 21 21:37:19 2009  Keiju Ishitsuka  <keiju@e...>
+
+	* lib/irb/cmd/help.rb: fixed irb's "help" command. [ruby-core:22310].
+
 Thu Jul 23 14:35:02 2009  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_{open,wopen}): fixed typos. these conditions
Index: ruby_1_9_1/lib/irb/cmd/help.rb
===================================================================
--- ruby_1_9_1/lib/irb/cmd/help.rb	(revision 26018)
+++ ruby_1_9_1/lib/irb/cmd/help.rb	(revision 26019)
@@ -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
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26018)
+++ ruby_1_9_1/version.h	(revision 26019)
@@ -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

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