From 0f577aac54c6baf5ece22de989761d1ac50f1bf8 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 Jan 2004 05:41:11 +0000
Subject: * parse.y (block_append): update nd_end for "real" head node.  
 [ruby-list:39058]

* eval.c (proc_eq): Proc with empty body may not be equal.
  [ruby-dev:22590]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/cgi.rb      | 2 +-
 lib/delegate.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/cgi.rb b/lib/cgi.rb
index 7f1f42260..f8158858f 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -923,7 +923,7 @@ class CGI
 
     %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
       define_method(env.sub(/^HTTP_/n, '').downcase) do
-        val = env_table[env] && Integer(val)
+        (val = env_table[env]) && Integer(val)
       end
     end
 
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 1ba4cf1e1..006910962 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -27,6 +27,7 @@ class Delegator
       preserved |= t.protected_instance_methods(false)
       break if t == Delegator
     end
+    preserved << "singleton_method_added"
     for method in obj.methods
       next if preserved.include? method
       begin
@@ -37,7 +38,7 @@ class Delegator
 	    rescue Exception
 	      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
 	      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
-	      raise
+	      Kernel::raise
 	    end
 	  end
 	EOS
-- 
cgit