nagai	2009-01-09 13:21:28 +0900 (Fri, 09 Jan 2009)

  New Revision: 21406

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21406

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

  Modified files:
    trunk/ChangeLog
    trunk/ext/tk/lib/tk.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21405)
+++ ChangeLog	(revision 21406)
@@ -1,3 +1,7 @@
+Fri Jan  9 13:20:08 2009  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
+
 Fri Jan  9 12:29:46 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (test-sample), rubytest.rb: use runruby.rb
Index: ext/tk/lib/tk.rb
===================================================================
--- ext/tk/lib/tk.rb	(revision 21405)
+++ ext/tk/lib/tk.rb	(revision 21406)
@@ -3019,7 +3019,7 @@
     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 @@
 #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'

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/