From 497b15746fd820e166973bb93420b46ca616e0e0 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 4 Dec 2008 08:55:28 +0000 Subject: 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 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tk/lib/tk.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/tk/lib') diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 67069abc3..6bc0ea63e 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -1109,7 +1109,7 @@ module TkCore 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 @@ TkWidget = TkWindow #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' -- cgit