1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2009-01-09 04:21:28 +00:00
parent 040a7fa7e2
commit c8b8db001b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Jan 9 13:20:08 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
Fri Jan 9 12:29:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jan 9 12:29:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (test-sample), rubytest.rb: use runruby.rb * common.mk (test-sample), rubytest.rb: use runruby.rb

4
ext/tk/lib/tk.rb
View File

@ -3019,7 +3019,7 @@ 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) loc_enc_obj = (::Encoding.find(::Encoding.locale_charmap) rescue Tk::Encoding::UNKNOWN)
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 +5550,7 @@ TkWidget = TkWindow
#Tk.freeze #Tk.freeze
module Tk module Tk
RELEASE_DATE = '2008-12-21'.freeze RELEASE_DATE = '2009-01-09'.freeze
autoload :AUTO_PATH, 'tk/variable' autoload :AUTO_PATH, 'tk/variable'
autoload :TCL_PACKAGE_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable'