diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:41:03 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:41:03 +0000 |
commit | a9777ca24c82de575f2119deecb2320ed0d6c071 (patch) | |
tree | 0d96104ec2f252e0da815d53674c7962cfccce0c | |
parent | 6fba2e0f015d2d3050543aed3dc1e7880a770019 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26019 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/irb/cmd/help.rb | 10 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 5 deletions
@@ -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 e1f47e2c97..1e600a6cd2 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 @@ -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 |