From 1a4a9f5152329ba543db69514a5845cb623d9235 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 7 Jun 2005 01:33:12 +0000
Subject: * ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures  
 delegated by master-ip.

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

diff --git a/ChangeLog b/ChangeLog
index 917851df6..af66965c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun  7 10:30:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
+	  delegated by master-ip.
+
 Mon Jun  6 16:35:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/ripper/depend: add .y to .SUFFIXES for nmake.
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index b5519af3c..6d048e91b 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -1333,7 +1333,7 @@ class MultiTkIp
     #self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
     #ret = self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
     ret = self.eval_callback(*args){|safe, *params|
-      $SAFE=safe
+      $SAFE=safe if $SAFE < safe
       TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
     }
     if ret.kind_of?(Exception)
@@ -1511,7 +1511,7 @@ class MultiTkIp
     else
       eval_proc_core(true, 
                      proc{|safe, *params| 
-                       $SAFE=safe
+                       $SAFE=safe if $SAFE < safe
                        Thread.new(*params, &cmd).value
                      },
                      *args)
@@ -1530,7 +1530,8 @@ class MultiTkIp
     Thread.new{
       eval_proc_core(false, 
                      proc{|safe, *params| 
-                       $SAFE=safe; Thread.new(*params, &cmd).value
+                       $SAFE=safe if $SAFE < safe
+                       Thread.new(*params, &cmd).value
                      },
                      *args)
     }
@@ -1545,7 +1546,11 @@ class MultiTkIp
       raise RuntimeError, "A String object is expected for the 'cmd' argument"
     end
 
-    eval_proc_core(true, proc{|safe| $SAFE=safe; Kernel.eval(cmd, *eval_args)})
+    eval_proc_core(true, 
+                   proc{|safe| 
+                     $SAFE=safe if $SAFE < safe
+                     Kernel.eval(cmd, *eval_args)
+                   })
   end
   alias eval_str eval_string
 
@@ -1556,7 +1561,10 @@ class MultiTkIp
     end
     Thread.new{
       eval_proc_core(true, 
-                     proc{|safe| $SAFE=safe; Kernel.eval(cmd, *eval_args)})
+                     proc{|safe| 
+                       $SAFE=safe if $SAFE < safe
+                       Kernel.eval(cmd, *eval_args)
+                     })
     }
   end
   alias background_eval_string bg_eval_string
-- 
cgit