merges r30741 from trunk into ruby_1_9_2.

--

* 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/branches/ruby_1_9_2@31201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

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