diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:32:06 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:32:06 +0000 |
commit | b1a4b40f86675889cf060555e19e4e9302034664 (patch) | |
tree | 895fd319e34b3565b74ed0bf2d34994ce2234914 /ext/tk | |
parent | 396fd88910548bbba2a6ae8d86292d3d9adb0098 (diff) |
merges r21406 from trunk into ruby_1_9_1.
* ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
-rw-r--r-- | ext/tk/lib/tk.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 86aad280fe..162fe83a3d 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.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' |