From 4ed5cda95148e2a355fb916f21f06e529bf375a2 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 28 Mar 2011 13:40:53 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ lib/irb/locale.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9295e47b2..5b2dbafedb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 31 14:45:47 2011 Yuki Sonoda (Yugui) + + * 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 * array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before 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 diff --git a/version.h b/version.h index c3946aa95c..ced27ae8f0 100644 --- a/version.h +++ b/version.h @@ -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