diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-20 02:02:48 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-20 02:02:48 +0000 |
| commit | 9e7ec5eafcbae57d5211ba415774536ab8bf0696 (patch) | |
| tree | 2e7d10fe4887106f61be0d95e92654f600e8f76c | |
| parent | e4963224156345c75601311518b32505ac1eb060 (diff) | |
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]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/irb/locale.rb | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Dec 20 10:59:16 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * 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@ruby-lang.org> * io.c (rb_io_extract_encoding_option): "internal_encoding: nil" diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb index d36cc5a80..d4e2a0244 100644 --- a/lib/irb/locale.rb +++ b/lib/irb/locale.rb @@ -29,12 +29,13 @@ module IRB @@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 |