* eval.c (rb_eval): call trace_func for if/while conditions.

* marshal.c (r_object): separate r_regist from proc calling.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/process.c b/process.c
index 7f1375dd3..e35308c0b 100644
--- a/process.c
+++ b/process.c
@@ -797,6 +797,7 @@ rb_syswait(pid)
 	signal(SIGQUIT, qfunc);
 #endif
 	signal(SIGINT, ifunc);
+	overriding = Qfalse;
     }
 }