diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-09 04:21:28 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-09 04:21:28 +0000 |
| commit | 320c9d3529f35b6f66fe2a6be6809e0c9c31adae (patch) | |
| tree | 45a44ef6fd985614fedf96b22e1d2dd3fdad1f5d /ext/tk/lib | |
| parent | 1f32708ea88920fcdaf7c6f77e71ed77508de36c (diff) | |
| download | ruby-320c9d3529f35b6f66fe2a6be6809e0c9c31adae.tar.gz ruby-320c9d3529f35b6f66fe2a6be6809e0c9c31adae.tar.xz ruby-320c9d3529f35b6f66fe2a6be6809e0c9c31adae.zip | |
* ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib')
| -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 86aad280f..162fe83a3 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' |