summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-06 16:08:26 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-06 16:08:26 +0000
commit1e4981c74e0a04925bfae4a7fad5a9e710fc2652 (patch)
treeb4270749cf9165ab7ef90180e32257562f9783cc
parent6a72a03a5123bcf3a2a131adb84d2050646f024f (diff)
downloadruby-1e4981c74e0a04925bfae4a7fad5a9e710fc2652.tar.gz
ruby-1e4981c74e0a04925bfae4a7fad5a9e710fc2652.tar.xz
ruby-1e4981c74e0a04925bfae4a7fad5a9e710fc2652.zip
* eval.c (rb_load): save and restore rb_prohibit_interrupt.
[ruby-dev:21857] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 39b079f86..0dd9a81f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 7 01:03:16 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_load): save and restore rb_prohibit_interrupt.
+ [ruby-dev:21857]
+
Thu Nov 6 18:05:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_inspect): show the path also at a closed file.
diff --git a/eval.c b/eval.c
index 48b133ed7..de8408170 100644
--- a/eval.c
+++ b/eval.c
@@ -5773,6 +5773,7 @@ rb_load(fname, wrap)
{
VALUE tmp;
int state;
+ volatile int prohibit_int = rb_prohibit_interrupt;
volatile ID last_func;
volatile VALUE wrapper = 0;
volatile VALUE self = ruby_top_self;
@@ -5850,6 +5851,7 @@ rb_load(fname, wrap)
free(ruby_scope->local_tbl);
}
POP_TAG();
+ rb_prohibit_interrupt = prohibit_int;
ruby_cref = saved_cref;
POP_SCOPE();
POP_FRAME();