2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6bb5115e4e..cc154dba64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov  7 09:51:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (blk_orphan): a block created in a different thread is
+	  orphan.  [ruby-dev:17471]
+
 Wed Nov  8 08:12:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* stable version 1.6.8 release candidate.
diff --git a/eval.c b/eval.c
index 282462ebe7..808455c29b 100644
--- a/eval.c
+++ b/eval.c
@@ -6381,10 +6381,8 @@ static int
 blk_orphan(data)
     struct BLOCK *data;
 {
-    if (!(data->scope->flag & SCOPE_NOSTACK)) {
-	return 0;
-    }
-    if ((data->tag->flags & BLOCK_ORPHAN)) {
+    if ((data->tag->flags & BLOCK_ORPHAN) &&
+	(data->scope->flag & SCOPE_NOSTACK)) {
 	return 1;
     }
     if (data->orig_thread != rb_thread_current()) {