yugui	2008-11-22 23:52:52 +0900 (Sat, 22 Nov 2008)

  New Revision: 20327

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

  Log:
    merges r20299 and r20303 from trunk into ruby_1_9_1.
    * ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb:
      fix NameError bug.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/tk/ChangeLog.tkextlib
    branches/ruby_1_9_1/ext/tk/lib/tkextlib/blt/vector.rb
    branches/ruby_1_9_1/ext/tk/lib/tkextlib/blt.rb
    branches/ruby_1_9_1/ext/tk/lib/tkextlib/version.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20326)
+++ ruby_1_9_1/ChangeLog	(revision 20327)
@@ -1,3 +1,8 @@
+Sat Nov 22 10:31:25 2008  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb: 
+	  fix NameError bug.
+
 Sat Nov 22 03:41:22 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/pty/pty.c (get_device_once): abandon asynchronous exception
Index: ruby_1_9_1/ext/tk/lib/tkextlib/blt/vector.rb
===================================================================
--- ruby_1_9_1/ext/tk/lib/tkextlib/blt/vector.rb	(revision 20326)
+++ ruby_1_9_1/ext/tk/lib/tkextlib/blt/vector.rb	(revision 20327)
@@ -49,11 +49,11 @@
         size = size.join(':')
       end
       if size
-        @id = INTERP._invoke('::blt::vector', 'create', 
-                             "#auto(#{size})", *hash_kv(keys))
+        @id = TkCore::INTERP._invoke('::blt::vector', 'create', 
+                                     "#auto(#{size})", *hash_kv(keys))
       else
-        @id = INTERP._invoke('::blt::vector', 'create', 
-                             "#auto", *hash_kv(keys))
+        @id = TkCore::INTERP._invoke('::blt::vector', 'create', 
+                                     "#auto", *hash_kv(keys))
       end
 
       TkVar_ID_TBL.mutex.synchronize{
@@ -68,7 +68,7 @@
       @trace_opts = nil
 
       # teach Tk-ip that @id is global var
-      INTERP._invoke_without_enc('global', @id)
+      TkCore::INTERP._invoke_without_enc('global', @id)
     end
 
     def destroy
@@ -250,7 +250,7 @@
       @trace_opts = nil
 
       # teach Tk-ip that @id is global var
-      INTERP._invoke_without_enc('global', @id)
+      TkCore::INTERP._invoke_without_enc('global', @id)
     end
   end
 end
Index: ruby_1_9_1/ext/tk/lib/tkextlib/blt.rb
===================================================================
--- ruby_1_9_1/ext/tk/lib/tkextlib/blt.rb	(revision 20326)
+++ ruby_1_9_1/ext/tk/lib/tkextlib/blt.rb	(revision 20327)
@@ -26,14 +26,14 @@
     PATCH_LEVEL = tk_call('set', 'blt_patchLevel')
 
     begin
-      lib = INTERP._invoke('set', 'blt_library')
+      lib = TkCore::INTERP._invoke('set', 'blt_library')
     rescue
       lib = ''
     end
     LIBRARY  = TkVarAccess.new('blt_library', lib)
 
     begin
-      lib = INTERP._invoke('set', 'blt_libPath')
+      lib = TkCore::INTERP._invoke('set', 'blt_libPath')
     rescue
       lib = ''
     end
Index: ruby_1_9_1/ext/tk/lib/tkextlib/version.rb
===================================================================
--- ruby_1_9_1/ext/tk/lib/tkextlib/version.rb	(revision 20326)
+++ ruby_1_9_1/ext/tk/lib/tkextlib/version.rb	(revision 20327)
@@ -2,5 +2,5 @@
 # release date of tkextlib
 #
 module Tk
-  Tkextlib_RELEASE_DATE = '2008-05-23'.freeze
+  Tkextlib_RELEASE_DATE = '2008-11-22'.freeze
 end
Index: ruby_1_9_1/ext/tk/ChangeLog.tkextlib
===================================================================
--- ruby_1_9_1/ext/tk/ChangeLog.tkextlib	(revision 20326)
+++ ruby_1_9_1/ext/tk/ChangeLog.tkextlib	(revision 20327)
@@ -1,3 +1,8 @@
+Sat Nov 22 10:31:25 2008  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb: 
+	  fix NameError bug.
+
 2008-05-12  Hidetoshi NAGAI  <nagai@a...>
 
 	* ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name.

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