summaryrefslogtreecommitdiffstats
path: root/lib/delegate.rb
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-27 06:05:04 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-27 06:05:04 +0000
commit28651fcd3db70dc779fd2d8d119229d3721de34b (patch)
tree034956384b778251a1dd4090d2f19a43a0d0025b /lib/delegate.rb
parentde3d93735d3babc6200bac593f5ec99ac876b3b4 (diff)
downloadruby-28651fcd3db70dc779fd2d8d119229d3721de34b.tar.gz
ruby-28651fcd3db70dc779fd2d8d119229d3721de34b.tar.xz
ruby-28651fcd3db70dc779fd2d8d119229d3721de34b.zip
* misc/ruby-mode.el: better support for general delimited
strings. [ruby-dev:22695] * lib/weakref.rb (WeakRef::initialize): set up @__id before calling "super". * lib/delegate.rb (Delegator::initialize): preserve singleton_method_added method [ruby-dev:22685] * lib/delegate.rb (Delegator::initialize): use Kernel::raise instead of mere raise. [ruby-dev:22681] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/delegate.rb')
-rw-r--r--lib/delegate.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 1ba4cf1e1..6ceaa67d2 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