From bd5c473b4b37ccd86dc592bc19168dd0afec99cd Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 28 Dec 2008 09:40:24 +0000
Subject: merges r21086 from trunk into ruby_1_9_1. * eval.c (get_errinfo):
 return th->errinfo value   if normal errinfo place (dynamic local viriable)
 is not found.   fixes Bug #732 [ruby-dev:37046]. *
 bootstraptest/test_proc.rb: add a test.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 eval.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'eval.c')

diff --git a/eval.c b/eval.c
index 2dd75afa8..74489d3a6 100644
--- a/eval.c
+++ b/eval.c
@@ -961,7 +961,8 @@ get_errinfo(void)
 	return *ptr;
     }
     else {
-	return Qnil;
+	rb_thread_t *th = GET_THREAD();
+	return th->errinfo;
     }
 }
 
-- 
cgit