1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/tk/lib/tk.rb: use Encoding.find("locale") instaed of

Encoding.locale_charmap


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2009-01-12 17:10:02 +00:00
parent 8106658535
commit 3f2b281eee
2 changed files with 8 additions and 2 deletions

View file

@ -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> Tue Jan 13 00:57:56 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (sock_s_unpack_sockaddr_in): check too short * ext/socket/socket.c (sock_s_unpack_sockaddr_in): check too short

View file

@ -3019,7 +3019,8 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
end end
else ### Ruby 1.9 !!!!!!!!!!!! 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 ext_enc_obj = ::Encoding.default_external
int_enc_obj = ::Encoding.default_internal || ext_enc_obj int_enc_obj = ::Encoding.default_internal || ext_enc_obj
tksys_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding_system) tksys_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding_system)
@ -5550,7 +5551,7 @@ TkWidget = TkWindow
#Tk.freeze #Tk.freeze
module Tk module Tk
RELEASE_DATE = '2009-01-09'.freeze RELEASE_DATE = '2009-01-13'.freeze
autoload :AUTO_PATH, 'tk/variable' autoload :AUTO_PATH, 'tk/variable'
autoload :TCL_PACKAGE_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable'