From 47de06d2edbd15afea4393e972c2d7536211a415 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 2 Feb 2006 07:18:12 +0000
Subject: * eval.c (eval): need not to protect $SAFE value.   [ruby-core:07177]

* struct.c (rb_struct_select): update RDoc description.
  [ruby-core:7254]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 16 ++++++++++++++++
 eval.c              |  1 -
 struct.c            |  8 +-------
 test/drb/drbtest.rb |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 91876b961..dfc601510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  2 16:01:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): need not to protect $SAFE value.
+	  [ruby-core:07177]
+
 Thu Feb  2 14:45:53 2006  Ville Mattila  <ville.mattila@stonesoft.com>
 
 	* configure.in: The isinf is not regognized by autoconf
@@ -12,6 +17,11 @@ Wed Feb  1 22:01:47 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	* ruby.c (set_arg0): if use setenv(3), environ space cannot be used
 	  for altering argv[0].
 
+Tue Jan 31 14:46:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_select): update RDoc description.
+	  [ruby-core:7254]
+
 Tue Jan 31 11:58:51 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: add MultiTkIp#eval and bg_eval.
@@ -228,6 +238,12 @@ Thu Dec 29 17:02:07 2005  Tanaka Akira  <akr@m17n.org>
 	* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
 	  "miniruby".  [ruby-dev:28140]
 
+Tue Dec 27 16:59:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/drb/drbtest.rb (DRbService::self.ext_service): increase
+	  timeout limit.  a patch from Kazuhiro NISHIYAMA
+	  <zn at mbf.nifty.com>. [ruby-dev:28132]
+
 Tue Dec 27 08:29:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
diff --git a/eval.c b/eval.c
index 81021dcad..7926f5982 100644
--- a/eval.c
+++ b/eval.c
@@ -6366,7 +6366,6 @@ eval(self, src, scope, file, line)
     POP_TAG();
     POP_CLASS();
     ruby_in_eval--;
-    ruby_safe_level = safe;
     if (!NIL_P(scope)) {
 	int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
 
diff --git a/struct.c b/struct.c
index 15546b981..cdc6efa4b 100644
--- a/struct.c
+++ b/struct.c
@@ -728,21 +728,15 @@ rb_struct_values_at(argc, argv, s)
 
 /*
  *  call-seq:
- *     struct.select(fixnum, ... )   => array
  *     struct.select {|i| block }    => array
  *  
- *  The first form returns an array containing the elements in
- *  <i>struct</i> corresponding to the given indices. The second
- *  form invokes the block passing in successive elements from
+ *  Invokes the block passing in successive elements from
  *  <i>struct</i>, returning an array containing those elements
  *  for which the block returns a true value (equivalent to
  *  <code>Enumerable#select</code>).
  *     
  *     Lots = Struct.new(:a, :b, :c, :d, :e, :f)
  *     l = Lots.new(11, 22, 33, 44, 55, 66)
- *     l.select(1, 3, 5)               #=> [22, 44, 66]
- *     l.select(0, 2, 4)               #=> [11, 33, 55]
- *     l.select(-1, -3, -5)            #=> [66, 44, 22]
  *     l.select {|v| (v % 2).zero? }   #=> [22, 44, 66]
  */
 
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 410a33c7e..30aafb578 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -31,7 +31,7 @@ class DRbService
     @server || @@server
   end
   def self.ext_service(name)
-    timeout(10, RuntimeError) do
+    timeout(100, RuntimeError) do
       manager.service(name)
     end
   end
-- 
cgit