ruby-changes:9352
From: yugui <ko1@a...>
Date: Sat, 20 Dec 2008 11:03:02 +0900 (JST)
Subject: [ruby-changes:9352] Ruby:r20889 (ruby_1_9_1): merges r20887 from trunk into ruby_1_9_1.
yugui 2008-12-20 11:02:48 +0900 (Sat, 20 Dec 2008) New Revision: 20889 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20889 Log: merges r20887 from trunk into ruby_1_9_1. * lib/irb/locale.rb (IRB::Locale#initialize) initializes instance variables to suppress warnings. typo fix to ignore LoadError: [ruby-dev:37508] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/lib/irb/locale.rb Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 20888) +++ ruby_1_9_1/ChangeLog (revision 20889) @@ -1,3 +1,9 @@ +Sat Dec 20 10:59:16 2008 Yuki Sonoda (Yugui) <yugui@y...> + + * lib/irb/locale.rb (IRB::Locale#initialize) + initializes instance variables to suppress warnings. + typo fix to ignore LoadError: [ruby-dev:37508] + Fri Dec 19 17:01:35 2008 Yukihiro Matsumoto <matz@r...> * io.c (rb_io_extract_encoding_option): "internal_encoding: nil" Index: ruby_1_9_1/lib/irb/locale.rb =================================================================== --- ruby_1_9_1/lib/irb/locale.rb (revision 20888) +++ ruby_1_9_1/lib/irb/locale.rb (revision 20889) @@ -29,12 +29,13 @@ @@legacy_encoding_alias_map = {}.freeze def initialize(locale = nil) + @lang = @territory = @encoding_name = @modifier = nil @locale = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C" if m = LOCALE_NAME_RE.match(@locale) @lang, @territory, @encoding_name, @modifier = m[:language], m[:territory], m[:codeset], m[:modifier] if @encoding_name - begin; load 'irb/encoding_aliases.rb' rescue LoadError; end + begin load 'irb/encoding_aliases.rb'; rescue LoadError; end if @encoding = @@legacy_encoding_alias_map[@encoding_name] warn "%s is obsolete. use %s" % ["#{@lang}_#{@territory}.#{@encoding_name}", "#{@lang}_#{@territory}.#{@encoding.name}"] end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/