mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
040a7fa7e2
commit
c8b8db001b
2 changed files with 6 additions and 2 deletions
|
@ -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>
|
||||
|
||||
* common.mk (test-sample), rubytest.rb: use runruby.rb
|
||||
|
|
|
@ -3019,7 +3019,7 @@ 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)
|
||||
loc_enc_obj = (::Encoding.find(::Encoding.locale_charmap) rescue Tk::Encoding::UNKNOWN)
|
||||
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 +5550,7 @@ TkWidget = TkWindow
|
|||
#Tk.freeze
|
||||
|
||||
module Tk
|
||||
RELEASE_DATE = '2008-12-21'.freeze
|
||||
RELEASE_DATE = '2009-01-09'.freeze
|
||||
|
||||
autoload :AUTO_PATH, 'tk/variable'
|
||||
autoload :TCL_PACKAGE_PATH, 'tk/variable'
|
||||
|
|
Loading…
Reference in a new issue