diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:35:57 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:35:57 +0000 |
| commit | 61b625863fb8dcc925b811993709104676dd0ce7 (patch) | |
| tree | 66962bd677647771442276f5256b9b2fb1267711 /ext | |
| parent | f035560f3523af2094c6d42353878cb75979d9f9 (diff) | |
merges r21472 from trunk into ruby_1_9_1.
* ext/tk/lib/tk.rb: use Encoding.find("locale") instaed of
Encoding.locale_charmap
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tk/lib/tk.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 162fe83a3d..85c1e76f83 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -3019,7 +3019,8 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK) end else ### Ruby 1.9 !!!!!!!!!!!! - loc_enc_obj = (::Encoding.find(::Encoding.locale_charmap) rescue Tk::Encoding::UNKNOWN) + # loc_enc_obj = (::Encoding.find(::Encoding.locale_charmap) rescue Tk::Encoding::UNKNOWN) + loc_enc_obj = ::Encoding.find("locale") ext_enc_obj = ::Encoding.default_external int_enc_obj = ::Encoding.default_internal || ext_enc_obj tksys_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding_system) @@ -5550,7 +5551,7 @@ TkWidget = TkWindow #Tk.freeze module Tk - RELEASE_DATE = '2009-01-09'.freeze + RELEASE_DATE = '2009-01-13'.freeze autoload :AUTO_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable' |