diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 17:10:02 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 17:10:02 +0000 |
| commit | 3af11b5be81462b82e8dca592ddaa57d4be54785 (patch) | |
| tree | 14e83587f8706de824074f8a3cbfe304e076b18a | |
| parent | 82a5150d2c32a0ba0a5eb45adcbb43e59eba62b5 (diff) | |
| download | ruby-3af11b5be81462b82e8dca592ddaa57d4be54785.tar.gz ruby-3af11b5be81462b82e8dca592ddaa57d4be54785.tar.xz ruby-3af11b5be81462b82e8dca592ddaa57d4be54785.zip | |
* ext/tk/lib/tk.rb: use Encoding.find("locale") instaed of
Encoding.locale_charmap
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/tk/lib/tk.rb | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Jan 13 02:07:38 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/lib/tk.rb: use Encoding.find("locale") instaed of + Encoding.locale_charmap + Tue Jan 13 00:57:56 2009 Tanaka Akira <akr@fsij.org> * ext/socket/socket.c (sock_s_unpack_sockaddr_in): check too short diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 162fe83a3..85c1e76f8 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' |