* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems

  directories.  a patch from Eric Hodel <drbrain at segment7.net>.
  [ruby-core:07423]

* eval.c (rb_thread_fd_writable): should not re-schedule output
  from KILLED thread (must be error printing).


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

1 files changed, 1 insertions, 0 deletions

diff --git a/eval.c b/eval.c
index fb1e4006b2..9f9626651a 100644
--- a/eval.c
+++ b/eval.c
@@ -10737,6 +10737,7 @@ rb_thread_fd_writable(fd)
     if (rb_thread_critical) return Qtrue;
     if (curr_thread == curr_thread->next) return Qtrue;
     if (curr_thread->status == THREAD_TO_KILL) return Qtrue;
+    if (curr_thread->status == THREAD_KILLED) return Qtrue;
 
     curr_thread->status = THREAD_STOPPED;
     FD_ZERO(&curr_thread->readfds);