From 8120eb66a76130b1a3f2c8e47720e03c82735c70 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 14 Sep 2004 14:59:04 +0000
Subject: * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string was en-bugged by the 
  previous changes.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/multi-tk.rb | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'ext/tk/lib')

diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index d54c6a502..2d758fc28 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -1200,17 +1200,6 @@ end
 class MultiTkIp
   # instance method
   def eval_proc_core(req_val, cmd, *args)
-    # cmd string ==> proc
-    if cmd.kind_of?(String)
-      xcmd  = cmd
-      xargs = args
-      cmd = proc{ 
-	$SAFE=@safe_level[0]
-	TkComm._get_eval_string(eval(xcmd, *xargs))
-      }
-      args = []
-    end
-
     # check
     unless cmd.kind_of?(Proc) || cmd.kind_of?(Method)
       raise RuntimeError, "A Proc/Method object is expected for the 'cmd' argument"
@@ -1314,7 +1303,16 @@ class MultiTkIp
 		   *args)
   end
   alias call eval_proc
-  alias eval_string eval_proc
+
+  def eval_string(cmd, *eval_args)
+    # cmd string ==> proc
+    unless cmd.kind_of?(String)
+      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)})
+  end
+  alias eval_str eval_string
 end
 
 class << MultiTkIp
-- 
cgit