merges r24659 from trunk into ruby_1_9_1.

--
* vm.c (collect_local_variables_in_env): skips internal variables.
  [ruby-core:25125]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 1 deletions

diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
index 6dc23468c..452ce4310 100644
--- a/bootstraptest/test_eval.rb
+++ b/bootstraptest/test_eval.rb
@@ -297,5 +297,14 @@ assert_equal "(eval):1:in `block in <main>': ", %q{
   rescue => e
     e.message
   end
-}, ' [ruby-dev:35392]'
+}, '[ruby-dev:35392]'
 
+assert_equal "[:x]", %q{
+  def kaboom!
+    yield.eval("local_variables")
+  end
+
+  for x in enum_for(:kaboom!)
+    binding
+  end
+}, '[ruby-core:25125]'