From c8b8db001b06e464982f227f6b0b893ac74228d6 Mon Sep 17 00:00:00 2001 From: nagai Date: Fri, 9 Jan 2009 04:21:28 +0000 Subject: * 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 --- ext/tk/lib/tk.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext') 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' -- cgit v1.2.3