summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-17 01:44:28 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-17 01:44:28 +0000
commit0ac141513715e39c4a1eaf5d1b942462269ffcd2 (patch)
tree0c86f84cefb69e2368590ccb095cc089784e2166
parent69f10cab7ab8fa737c6f848bccde97b4bbe4871d (diff)
downloadruby-0ac141513715e39c4a1eaf5d1b942462269ffcd2.tar.gz
ruby-0ac141513715e39c4a1eaf5d1b942462269ffcd2.tar.xz
ruby-0ac141513715e39c4a1eaf5d1b942462269ffcd2.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@9191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/tk/lib/multi-tk.rb8
-rw-r--r--ext/tk/lib/tk.rb2
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d420259d..db1e1d6ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Sep 17 10:42:13 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * 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).
+
Sat Sep 17 08:35:39 2005 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixed
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index fd1b511e0..d10e304a3 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 0c88b0ac8..c3e92f409 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'