* ext/socket/socket.c: document from Sam Roberts

  <sroberts@uniserve.com> for getsockopt and setsockopt is merged.
  [ruby-doc:824]

* eval.c (block_pass): should not push unique number if a block is
  not an orphan.  [ruby-dev:25808]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index 2cbb985091..761ef08d09 100644
--- a/eval.c
+++ b/eval.c
@@ -8484,7 +8484,7 @@ block_pass(self, node)
     old_block = ruby_block;
     _block = *data;
     _block.outer = ruby_block;
-    _block.uniq = block_unique++;
+    if (orphan) _block.uniq = block_unique++;
     ruby_block = &_block;
     PUSH_ITER(ITER_PRE);
     if (ruby_frame->iter == ITER_NOT)