yugui	2008-12-04 17:55:28 +0900 (Thu, 04 Dec 2008)

  New Revision: 20503

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

  Log:
    merges r20475 from trunk into ruby_1_9_1.
    * ext/tk/lib/tk.rb: bug fix. use ::RubyVM instead of ::VM [ruby-list:45676]
    * ext/tk/tcltklib.c: update RELEASE_DATE

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

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20502)
+++ ruby_1_9_1/ChangeLog	(revision 20503)
@@ -1,3 +1,10 @@
+Thu Dec  4 05:06:47 2008  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/lib/tk.rb: bug fix. use ::RubyVM instead of ::VM 
+	  [ruby-list:45676]
+
+	* ext/tk/tcltklib.c: update RELEASE_DATE
+
 Thu Dec  4 01:37:47 2008  Tadayoshi Funaba  <tadf@d...>
 
 	* complex.c (nurat_{to_s,inspect}): provides better representation
Index: ruby_1_9_1/ext/tk/tcltklib.c
===================================================================
--- ruby_1_9_1/ext/tk/tcltklib.c	(revision 20502)
+++ ruby_1_9_1/ext/tk/tcltklib.c	(revision 20503)
@@ -4,7 +4,7 @@
  *              Oct. 24, 1997   Y. Matsumoto
  */
 
-#define TCLTKLIB_RELEASE_DATE "2008-10-20"
+#define TCLTKLIB_RELEASE_DATE "2008-12-03"
 
 #include "ruby.h"
 
Index: ruby_1_9_1/ext/tk/lib/tk.rb
===================================================================
--- ruby_1_9_1/ext/tk/lib/tk.rb	(revision 20502)
+++ ruby_1_9_1/ext/tk/lib/tk.rb	(revision 20503)
@@ -1109,7 +1109,7 @@
   include TkComm
   extend TkComm
 
-  WITH_RUBY_VM  = Object.const_defined?(:VM) && ::VM.class == Class
+  WITH_RUBY_VM  = Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
   WITH_ENCODING = defined?(::Encoding.default_external) && true
   #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
   #if TclTkLib::WINDOWING_SYSTEM == 'aqua'
@@ -5529,7 +5529,7 @@
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2008-10-20'.freeze
+  RELEASE_DATE = '2008-12-04'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'

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