summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-11 10:15:47 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-11 10:15:47 +0000
commitf8e895cfcf4fe7ae32584a600abbead381ac5f3d (patch)
tree5c15b2b62873f542b7ca9d98cb7c2ced11e25797
parent8d0106a96b4eaf32804415433de6767684f701ba (diff)
downloadruby-f8e895cfcf4fe7ae32584a600abbead381ac5f3d.tar.gz
ruby-f8e895cfcf4fe7ae32584a600abbead381ac5f3d.tar.xz
ruby-f8e895cfcf4fe7ae32584a600abbead381ac5f3d.zip
* ext/tk/lib/multi-tk.rb: remove restriction on the class of
pseudo-toplevel. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/lib/multi-tk.rb6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 56e59ea00..6d4fd0cdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 11 19:13:33 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: remove restriction on the class of
+ pseudo-toplevel.
+
Tue Jul 11 18:00:57 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: security fix.
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index 0211a1506..36cb4388a 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -766,7 +766,8 @@ class MultiTkIp
fail SecurityError, "no permission to manipulate"
end
- if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
+ # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
+ if m.respond_to?(:pseudo_toplevel_evaluable?)
@pseudo_toplevel[0] = true
@pseudo_toplevel[1] = m
else
@@ -1770,7 +1771,8 @@ class MultiTkIp
fail SecurityError, "no permission to manipulate"
end
- if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
+ # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
+ if m.respond_to?(:pseudo_toplevel_evaluable?)
@pseudo_toplevel[0] = true
@pseudo_toplevel[1] = m
else