archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merges r30741 from trunk into ruby_1_9_2.

Browse source 
--

* 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
This commit is contained in:
yugui 2011-03-28 13:40:53 +00:00
parent 03a7970e95
commit 4ed5cda951
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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 04:45:12 2011 NARUSE, Yui <naruse@ruby-lang.org> Mon Jan 31 04:45:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
* array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before * array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before

2
lib/irb/locale.rb
View file

@ -147,7 +147,7 @@ module IRB
full_path = File.join(libpath, lc_path) full_path = File.join(libpath, lc_path)
return full_path if File.readable?(full_path) return full_path if File.readable?(full_path)
end end
redo if Gem.try_activate(lc_path) redo if defined?(Gem) and Gem.try_activate(lc_path)
end end
nil nil
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 184 #define RUBY_PATCHLEVEL 185
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1