From 762ed0d68c7cfb96c8e4c1a67030a01e7825c9a5 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Sep 2005 01:44:28 +0000
Subject: * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string  
 should call Kernel.eval on caller's safe-level instead of slave's  
 safe-level (Of course, the given script should be evaluated on   slave's
 safe-level).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/multi-tk.rb | 8 ++++----
 ext/tk/lib/tk.rb       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ext')

diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index fd1b511e05..d10e304a3d 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -1577,8 +1577,8 @@ class MultiTkIp
 
     eval_proc_core(true, 
                    proc{|safe| 
-                     $SAFE=safe if $SAFE < safe
-                     Kernel.eval(cmd, *eval_args)
+                     Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
+                                 *eval_args)
                    })
   end
   alias eval_str eval_string
@@ -1591,8 +1591,8 @@ class MultiTkIp
     Thread.new{
       eval_proc_core(true, 
                      proc{|safe| 
-                       $SAFE=safe if $SAFE < safe
-                       Kernel.eval(cmd, *eval_args)
+                       Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
+                                   *eval_args)
                      })
     }
   end
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 0c88b0ac89..c3e92f4097 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -4437,7 +4437,7 @@ end
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2005-09-16'.freeze
+  RELEASE_DATE = '2005-09-17'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'
-- 
cgit v1.2.3