diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:34:03 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:34:03 +0000 |
commit | 8d74e302ba7b5520de0e7e35fb69c82fe8952fd3 (patch) | |
tree | 714c584ef772e9e91c3e2339bbfe4ca05bd5a772 /eval.c | |
parent | 12185d8efa6208481629643bcfeba4b50c0c0253 (diff) | |
download | ruby-8d74e302ba7b5520de0e7e35fb69c82fe8952fd3.tar.gz ruby-8d74e302ba7b5520de0e7e35fb69c82fe8952fd3.tar.xz ruby-8d74e302ba7b5520de0e7e35fb69c82fe8952fd3.zip |
merges r24401 from trunk into ruby_1_9_1.
--
* eval.c (rb_longjmp): reset raised flag before fatal error.
* eval_error.c (error_print): file can be NULL. line can be 0.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -345,6 +345,7 @@ rb_longjmp(int tag, VALUE mesg) if (rb_thread_set_raised(th)) { th->errinfo = exception_error; + rb_thread_reset_raised(th); JUMP_TAG(TAG_FATAL); } |