yugui	2009-01-12 22:32:06 +0900 (Mon, 12 Jan 2009)

  New Revision: 21456

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

  Log:
    merges r21406 from trunk into ruby_1_9_1.
    * ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/tk/lib/tk.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21455)
+++ ruby_1_9_1/ChangeLog	(revision 21456)
@@ -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 10:40:52 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/ruby/test_process.rb (TestProcess::MANDATORY_ENVS): some
Index: ruby_1_9_1/ext/tk/lib/tk.rb
===================================================================
--- ruby_1_9_1/ext/tk/lib/tk.rb	(revision 21455)
+++ ruby_1_9_1/ext/tk/lib/tk.rb	(revision 21456)
@@ -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/