yugui	2011-03-28 22:40:53 +0900 (Mon, 28 Mar 2011)

  New Revision: 31201

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

  Log:
    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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/irb/locale.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31200)
+++ ruby_1_9_2/ChangeLog	(revision 31201)
@@ -1,3 +1,8 @@
+Mon Jan 31 14:45:47 2011  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* lib/irb/locale.rb (IRB::Locale::#search_file):
+	  Gem might be undefined if --disable-gems. [ruby-core:34990]
+
 Mon Jan 31 04:45:12 2011  NARUSE, Yui  <naruse@r...>
 
 	* array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before
Index: ruby_1_9_2/lib/irb/locale.rb
===================================================================
--- ruby_1_9_2/lib/irb/locale.rb	(revision 31200)
+++ ruby_1_9_2/lib/irb/locale.rb	(revision 31201)
@@ -147,7 +147,7 @@
           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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31200)
+++ ruby_1_9_2/version.h	(revision 31201)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 184
+#define RUBY_PATCHLEVEL 185
 #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/