From e5226ea394da345a1abf7719d4e0482de89df26e Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Dec 2005 11:53:33 +0000
Subject: [PATCH] * eval.c (rb_mod_define_method): should save safe_level in
 the   proc object.  [ruby-dev:28146]

* test/drb/drbtest.rb (DRbService::self.ext_service): increase
  timeout limit.  a patch from Kazuhiro NISHIYAMA
  <zn at mbf.nifty.com>. [ruby-dev:28132]

* eval.c (ev_const_get): fixed a bug in constant reference during
  instance_eval.  [yarv-dev:707]

* eval.c (ev_const_defined): ditto.

* lib/yaml.rb (YAML::add_domain_type): typo fixed.  a patch from
  Joel VanderWerf <vjoel at path.berkeley.edu>.
  [ruby-talk:165285] [ruby-core:6995]

* ext/digest/sha2/sha2.c (ULL): support AIX C.  a patch from
  Kailden <kailden at gmail.com>.  [ruby-core:06984]

* ext/syck/rubyext.c (rb_syck_compile): avoid potential memory
  leak.

* ext/syck/rubyext.c (syck_set_ivars): avoid potential memory
  leak by explicit symbol allocation.

* lib/delegate.rb (Delegator::method_missing): should delegate
  block as well.

* lib/cgi.rb (CGI::QueryExtension::MorphingBody): fix criteria to
  use Tempfile.  A fix from Zev Blut <rubyzbibd at ubit.com>.
  [ruby-core:06076]

* string.c: remove global functions work on $_.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_whileuntil.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/ruby/test_whileuntil.rb b/test/ruby/test_whileuntil.rb
index 6faed31160..39b770b806 100644
--- a/test/ruby/test_whileuntil.rb
+++ b/test/ruby/test_whileuntil.rb
@@ -31,15 +31,15 @@ class TestWhileuntil < Test::Unit::TestCase
     tmp.close
 
     tmp = open("while_tmp", "r")
-    while tmp.gets()
-      line = $_
-      gsub(/vt100/, 'VT100')
-      if $_ != line
-        $_.gsub!('VT100', 'Vt100')
+    while line = tmp.gets()
+      lastline = line
+      line = line.gsub(/vt100/, 'VT100')
+      if lastline != line
+        line.gsub!('VT100', 'Vt100')
         redo
       end
-      assert_no_match(/vt100/, $_)
-      assert_no_match(/VT100/, $_)
+      assert_no_match(/vt100/, line)
+      assert_no_match(/VT100/, line)
     end
     assert(tmp.eof?)
     tmp.close