diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-31 05:46:50 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-31 05:46:50 +0000 |
commit | 9a89f325e436460c87e58a1b25009aad79f247df (patch) | |
tree | 7907e632d168473ac7f9c68ef28c8a815cc88692 | |
parent | 48de1e292a4f65840f01d31c5f8607f6b585057d (diff) | |
download | ruby-9a89f325e436460c87e58a1b25009aad79f247df.tar.gz |
* lib/irb/locale.rb (IRB::Locale::#search_file):
Gem might be undefined if --disable-gems. [ruby-core:34990]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/irb/locale.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Jan 31 14:45:47 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * lib/irb/locale.rb (IRB::Locale::#search_file): + Gem might be undefined if --disable-gems. [ruby-core:34990] + Mon Jan 31 12:26:14 2011 NARUSE, Yui <naruse@ruby-lang.org> * addr2line.c: suppressed shorten-64-to-32 warnings. diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb index 142b9a5951..77cc06ed30 100644 --- a/lib/irb/locale.rb +++ b/lib/irb/locale.rb @@ -147,7 +147,7 @@ module IRB full_path = File.join(libpath, lc_path) return full_path if File.readable?(full_path) end - redo if Gem.try_activate(lc_path) + redo if defined?(Gem) and Gem.try_activate(lc_path) end nil end |