merges r23959 from trunk into ruby_1_9_1.

--
* thread.c (rb_threadptr_exec_event_hooks): new function to
  execute event hooks, with preserving errinfo.  [ruby-core:24118]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index a446969f38..5898ce488d 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -181,4 +181,9 @@ class TestSetTraceFunc < Test::Unit::TestCase
   def test_invalid_proc
     assert_raise(TypeError) { set_trace_func(1) }
   end
+
+  def test_raise_in_trace
+    set_trace_func proc {raise rescue nil}
+    assert_equal(42, (raise rescue 42), '[ruby-core:24118]')
+  end
 end